Update to libjpeg_turbo 1.4.90

turbojpeg-jni.c

 /*
- * Copyright (C)2011-2013 D. R. Commander.  All Rights Reserved.
+ * Copyright (C)2011-2016 D. R. Commander.  All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * - Redistributions of source code must retain the above copyright notice,
  *   this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright notice,
  *   this list of conditions and the following disclaimer in the documentation
  *   and/or other materials provided with the distribution.
  * - Neither the name of the libjpeg-turbo Project nor the names of its
@@ skipping 17 matching lines @@
 #include <string.h>
 #include "turbojpeg.h"
 #ifdef WIN32
 #include "tjutil.h"
 #endif
 #include <jni.h>
 #include "java/org_libjpegturbo_turbojpeg_TJCompressor.h"
 #include "java/org_libjpegturbo_turbojpeg_TJDecompressor.h"
 #include "java/org_libjpegturbo_turbojpeg_TJ.h"
 
-#define _throw(msg) {  \
-        jclass _exccls=(*env)->FindClass(env, "java/lang/Exception");  \
-        if(!_exccls) goto bailout;  \
+#define PAD(v, p) ((v+(p)-1)&(~((p)-1)))
+
+#define _throw(msg, exceptionClass) {  \
+        jclass _exccls=(*env)->FindClass(env, exceptionClass);  \
+        if(!_exccls || (*env)->ExceptionCheck(env)) goto bailout;  \
         (*env)->ThrowNew(env, _exccls, msg);  \
         goto bailout;  \
 }
 
-#define bailif0(f) {if(!(f)) {  \
-        char temps[80];  \
-        snprintf(temps, 80, "Unexpected NULL condition in line %d", __LINE__);  \
-        _throw(temps);  \
+#define _throwtj() _throw(tjGetErrorStr(), "org/libjpegturbo/turbojpeg/TJException")
+
+#define _throwarg(msg) _throw(msg, "java/lang/IllegalArgumentException")
+
+#define _throwmem() _throw("Memory allocation failure", "java/lang/OutOfMemoryError");
+
+#define bailif0(f) {if(!(f) || (*env)->ExceptionCheck(env)) {  \
+        goto bailout;  \
 }}
 
 #define gethandle()  \
         jclass _cls=(*env)->GetObjectClass(env, obj);  \
         jfieldID _fid;  \
-        if(!_cls) goto bailout;  \
+        if(!_cls || (*env)->ExceptionCheck(env)) goto bailout;  \
         bailif0(_fid=(*env)->GetFieldID(env, _cls, "handle", "J"));  \
-        handle=(tjhandle)(jlong)(*env)->GetLongField(env, obj, _fid);  \
+        handle=(tjhandle)(size_t)(*env)->GetLongField(env, obj, _fid);  \
 
+#ifdef _WIN32
+#define setenv(envvar, value, dummy) _putenv_s(envvar, value)
+#endif
+
+#define prop2env(property, envvar)  \
+{  \
+        if((jName=(*env)->NewStringUTF(env, property))!=NULL  \
+                && (jValue=(*env)->CallStaticObjectMethod(env, cls, mid, jName))!=NULL)  \
+        {  \
+                if((value=(*env)->GetStringUTFChars(env, jValue, 0))!=NULL)  \
+                {  \
+                        setenv(envvar, value, 1);  \
+                        (*env)->ReleaseStringUTFChars(env, jValue, value);  \
+                }  \
+        }  \
+}
+
+int ProcessSystemProperties(JNIEnv *env)
+{
+        jclass cls;  jmethodID mid;
+        jstring jName, jValue;
+        const char *value;
+
+        bailif0(cls=(*env)->FindClass(env, "java/lang/System"));
+        bailif0(mid=(*env)->GetStaticMethodID(env, cls, "getProperty",
+                "(Ljava/lang/String;)Ljava/lang/String;"));
+
+        prop2env("turbojpeg.optimize", "TJ_OPTIMIZE");
+        prop2env("turbojpeg.arithmetic", "TJ_ARITHMETIC");
+        prop2env("turbojpeg.restart", "TJ_RESTART");
+        prop2env("turbojpeg.progressive", "TJ_PROGRESSIVE");
+        return 0;
+
+        bailout:
+        return -1;
+}
+
+/* TurboJPEG 1.2.x: TJ::bufSize() */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSize
         (JNIEnv *env, jclass cls, jint width, jint height, jint jpegSubsamp)
 {
         jint retval=(jint)tjBufSize(width, height, jpegSubsamp);
-        if(retval==-1) _throw(tjGetErrorStr());
+        if(retval==-1) _throwarg(tjGetErrorStr());
 
         bailout:
         return retval;
 }
 
-JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV
-        (JNIEnv *env, jclass cls, jint width, jint height, jint subsamp)
+/* TurboJPEG 1.4.x: TJ::bufSizeYUV() */
+JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV__IIII
+        (JNIEnv *env, jclass cls, jint width, jint pad, jint height, jint subsamp)
 {
-        jint retval=(jint)tjBufSizeYUV(width, height, subsamp);
-        if(retval==-1) _throw(tjGetErrorStr());
+        jint retval=(jint)tjBufSizeYUV2(width, pad, height, subsamp);
+        if(retval==-1) _throwarg(tjGetErrorStr());
 
         bailout:
         return retval;
 }
 
+/* TurboJPEG 1.2.x: TJ::bufSizeYUV() */
+JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV__III
+        (JNIEnv *env, jclass cls, jint width, jint height, jint subsamp)
+{
+        return Java_org_libjpegturbo_turbojpeg_TJ_bufSizeYUV__IIII(env, cls, width,
+                4, height, subsamp);
+}
+
+/* TurboJPEG 1.4.x: TJ::planeSizeYUV() */
+JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_planeSizeYUV__IIIII
+        (JNIEnv *env, jclass cls, jint componentID, jint width, jint stride,
+                jint height, jint subsamp)
+{
+        jint retval=(jint)tjPlaneSizeYUV(componentID, width, stride, height,
+                subsamp);
+        if(retval==-1) _throwarg(tjGetErrorStr());
+
+        bailout:
+        return retval;
+}
+
+/* TurboJPEG 1.4.x: TJ::planeWidth() */
+JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_planeWidth__III
+        (JNIEnv *env, jclass cls, jint componentID, jint width, jint subsamp)
+{
+        jint retval=(jint)tjPlaneWidth(componentID, width, subsamp);
+        if(retval==-1) _throwarg(tjGetErrorStr());
+
+        bailout:
+        return retval;
+}
+
+/* TurboJPEG 1.4.x: TJ::planeHeight() */
+JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJ_planeHeight__III
+        (JNIEnv *env, jclass cls, jint componentID, jint height, jint subsamp)
+{
+        jint retval=(jint)tjPlaneHeight(componentID, height, subsamp);
+        if(retval==-1) _throwarg(tjGetErrorStr());
+
+        bailout:
+        return retval;
+}
+
+/* TurboJPEG 1.2.x: TJCompressor::init() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_init
         (JNIEnv *env, jobject obj)
 {
         jclass cls;
         jfieldID fid;
         tjhandle handle;
 
         if((handle=tjInitCompress())==NULL)
-                _throw(tjGetErrorStr());
+                _throwtj();
 
         bailif0(cls=(*env)->GetObjectClass(env, obj));
         bailif0(fid=(*env)->GetFieldID(env, cls, "handle", "J"));
-        (*env)->SetLongField(env, obj, fid, (jlong)handle);
+        (*env)->SetLongField(env, obj, fid, (size_t)handle);
 
         bailout:
         return;
 }
 
-JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3BIIIIII_3BIII
-        (JNIEnv *env, jobject obj, jbyteArray src, jint x, jint y, jint width,
-                jint pitch, jint height, jint pf, jbyteArray dst, jint jpegSubsamp,
-                jint jpegQual, jint flags)
+static jint TJCompressor_compress
+        (JNIEnv *env, jobject obj, jarray src, jint srcElementSize, jint x, jint y,
+                jint width, jint pitch, jint height, jint pf, jbyteArray dst,
+                jint jpegSubsamp, jint jpegQual, jint flags)
 {
         tjhandle handle=0;
         unsigned long jpegSize=0;
         jsize arraySize=0, actualPitch;
         unsigned char *srcBuf=NULL, *jpegBuf=NULL;
 
         gethandle();
 
         if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF || width<1 || height<1
                 || pitch<0)
-                _throw("Invalid argument in compress()");
+                _throwarg("Invalid argument in compress()");
         if(org_libjpegturbo_turbojpeg_TJ_NUMPF!=TJ_NUMPF)
-                _throw("Mismatch between Java and C API");
+                _throwarg("Mismatch between Java and C API");
 
         actualPitch=(pitch==0)? width*tjPixelSize[pf]:pitch;
-        arraySize=(y+height-1)*actualPitch + x+width;
-        if((*env)->GetArrayLength(env, src)<arraySize)
-                _throw("Source buffer is not large enough");
+        arraySize=(y+height-1)*actualPitch + (x+width)*tjPixelSize[pf];
+        if((*env)->GetArrayLength(env, src)*srcElementSize<arraySize)
+                _throwarg("Source buffer is not large enough");
         jpegSize=tjBufSize(width, height, jpegSubsamp);
         if((*env)->GetArrayLength(env, dst)<(jsize)jpegSize)
-                _throw("Destination buffer is not large enough");
+                _throwarg("Destination buffer is not large enough");
 
         bailif0(srcBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0));
         bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, dst, 0));
 
+        if(ProcessSystemProperties(env)<0) goto bailout;
+
         if(tjCompress2(handle, &srcBuf[y*actualPitch + x*tjPixelSize[pf]], width,
                 pitch, height, pf, &jpegBuf, &jpegSize, jpegSubsamp, jpegQual,
                 flags|TJFLAG_NOREALLOC)==-1)
-        {
-                (*env)->ReleasePrimitiveArrayCritical(env, dst, jpegBuf, 0);
-                (*env)->ReleasePrimitiveArrayCritical(env, src, srcBuf, 0);
-                jpegBuf=srcBuf=NULL;
-                _throw(tjGetErrorStr());
-        }
+                _throwtj();
 
         bailout:
         if(jpegBuf) (*env)->ReleasePrimitiveArrayCritical(env, dst, jpegBuf, 0);
         if(srcBuf) (*env)->ReleasePrimitiveArrayCritical(env, src, srcBuf, 0);
         return (jint)jpegSize;
 }
 
+/* TurboJPEG 1.3.x: TJCompressor::compress() byte source */
+JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3BIIIIII_3BIII
+        (JNIEnv *env, jobject obj, jbyteArray src, jint x, jint y, jint width,
+                jint pitch, jint height, jint pf, jbyteArray dst, jint jpegSubsamp,
+                jint jpegQual, jint flags)
+{
+        return TJCompressor_compress(env, obj, src, 1, x, y, width, pitch, height,
+                pf, dst, jpegSubsamp, jpegQual, flags);
+}
+
+/* TurboJPEG 1.2.x: TJCompressor::compress() byte source */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3BIIII_3BIII
         (JNIEnv *env, jobject obj, jbyteArray src, jint width, jint pitch,
                 jint height, jint pf, jbyteArray dst, jint jpegSubsamp, jint jpegQual,
                 jint flags)
 {
-        return Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3BIIIIII_3BIII(
-                env, obj, src, 0, 0, width, pitch, height, pf, dst, jpegSubsamp, jpegQual,
-                flags);
-}
-
+        return TJCompressor_compress(env, obj, src, 1, 0, 0, width, pitch, height,
+                pf, dst, jpegSubsamp, jpegQual, flags);
+}
+
+/* TurboJPEG 1.3.x: TJCompressor::compress() int source */
 JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3IIIIIII_3BIII
         (JNIEnv *env, jobject obj, jintArray src, jint x, jint y, jint width,
                 jint stride, jint height, jint pf, jbyteArray dst, jint jpegSubsamp,
                 jint jpegQual, jint flags)
 {
+        if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF)
+                _throwarg("Invalid argument in compress()");
+        if(tjPixelSize[pf]!=sizeof(jint))
+                _throwarg("Pixel format must be 32-bit when compressing from an integer buffer.");
+
+        return TJCompressor_compress(env, obj, src, sizeof(jint), x, y, width,
+                stride*sizeof(jint), height, pf, dst, jpegSubsamp, jpegQual, flags);
+
+        bailout:
+        return 0;
+}
+
+/* TurboJPEG 1.2.x: TJCompressor::compress() int source */
+JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3IIIII_3BIII
+        (JNIEnv *env, jobject obj, jintArray src, jint width, jint stride,
+                jint height, jint pf, jbyteArray dst, jint jpegSubsamp, jint jpegQual,
+                jint flags)
+{
+        if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF)
+                _throwarg("Invalid argument in compress()");
+        if(tjPixelSize[pf]!=sizeof(jint))
+                _throwarg("Pixel format must be 32-bit when compressing from an integer buffer.");
+
+        return TJCompressor_compress(env, obj, src, sizeof(jint), 0, 0, width,
+                stride*sizeof(jint), height, pf, dst, jpegSubsamp, jpegQual, flags);
+
+        bailout:
+        return 0;
+}
+
+/* TurboJPEG 1.4.x: TJCompressor::compressFromYUV() */
+JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compressFromYUV___3_3B_3II_3III_3BII
+        (JNIEnv *env, jobject obj, jobjectArray srcobjs, jintArray jSrcOffsets,
+                jint width, jintArray jSrcStrides, jint height, jint subsamp,
+                jbyteArray dst, jint jpegQual, jint flags)
+{
         tjhandle handle=0;
         unsigned long jpegSize=0;
-        jsize arraySize=0, actualStride;
-        unsigned char *srcBuf=NULL, *jpegBuf=NULL;
+        jbyteArray jSrcPlanes[3]={NULL, NULL, NULL};
+        const unsigned char *srcPlanes[3];
+        unsigned char *jpegBuf=NULL;
+        int *srcOffsets=NULL, *srcStrides=NULL;
+        int nc=(subsamp==org_libjpegturbo_turbojpeg_TJ_SAMP_GRAY? 1:3), i;
 
         gethandle();
 
+        if(subsamp<0 || subsamp>=org_libjpegturbo_turbojpeg_TJ_NUMSAMP)
+                _throwarg("Invalid argument in compressFromYUV()");
+        if(org_libjpegturbo_turbojpeg_TJ_NUMSAMP!=TJ_NUMSAMP)
+                _throwarg("Mismatch between Java and C API");
+
+        if((*env)->GetArrayLength(env, srcobjs)<nc)
+                _throwarg("Planes array is too small for the subsampling type");
+        if((*env)->GetArrayLength(env, jSrcOffsets)<nc)
+                _throwarg("Offsets array is too small for the subsampling type");
+        if((*env)->GetArrayLength(env, jSrcStrides)<nc)
+                _throwarg("Strides array is too small for the subsampling type");
+
+        jpegSize=tjBufSize(width, height, subsamp);
+        if((*env)->GetArrayLength(env, dst)<(jsize)jpegSize)
+                _throwarg("Destination buffer is not large enough");
+
+        bailif0(srcOffsets=(*env)->GetPrimitiveArrayCritical(env, jSrcOffsets, 0));
+        bailif0(srcStrides=(*env)->GetPrimitiveArrayCritical(env, jSrcStrides, 0));
+        for(i=0; i<nc; i++)
+        {
+                int planeSize=tjPlaneSizeYUV(i, width, srcStrides[i], height, subsamp);
+                int pw=tjPlaneWidth(i, width, subsamp);
+
+                if(planeSize<0 || pw<0)
+                        _throwarg(tjGetErrorStr());
+
+                if(srcOffsets[i]<0)
+                        _throwarg("Invalid argument in compressFromYUV()");
+                if(srcStrides[i]<0 && srcOffsets[i]-planeSize+pw<0)
+                        _throwarg("Negative plane stride would cause memory to be accessed below plane boundary");
+
+                bailif0(jSrcPlanes[i]=(*env)->GetObjectArrayElement(env, srcobjs, i));
+                if((*env)->GetArrayLength(env, jSrcPlanes[i])<srcOffsets[i]+planeSize)
+                        _throwarg("Source plane is not large enough");
+
+                bailif0(srcPlanes[i]=(*env)->GetPrimitiveArrayCritical(env, jSrcPlanes[i],
+                        0));
+                srcPlanes[i]=&srcPlanes[i][srcOffsets[i]];
+        }
+        bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, dst, 0));
+
+        if(ProcessSystemProperties(env)<0) goto bailout;
+
+        if(tjCompressFromYUVPlanes(handle, srcPlanes, width, srcStrides, height,
+                subsamp, &jpegBuf, &jpegSize, jpegQual, flags|TJFLAG_NOREALLOC)==-1)
+                _throwtj();
+
+        bailout:
+        if(jpegBuf) (*env)->ReleasePrimitiveArrayCritical(env, dst, jpegBuf, 0);
+        for(i=0; i<nc; i++)
+        {
+                if(srcPlanes[i] && jSrcPlanes[i])
+                        (*env)->ReleasePrimitiveArrayCritical(env, jSrcPlanes[i],
+                                (unsigned char *)srcPlanes[i], 0);
+        }
+        if(srcStrides)
+                (*env)->ReleasePrimitiveArrayCritical(env, jSrcStrides, srcStrides, 0);
+        if(srcOffsets)
+                (*env)->ReleasePrimitiveArrayCritical(env, jSrcOffsets, srcOffsets, 0);
+        return (jint)jpegSize;
+}
+
+static void TJCompressor_encodeYUV
+        (JNIEnv *env, jobject obj, jarray src, jint srcElementSize, jint x, jint y,
+                jint width, jint pitch, jint height, jint pf, jobjectArray dstobjs,
+                jintArray jDstOffsets, jintArray jDstStrides, jint subsamp, jint flags)
+{
+        tjhandle handle=0;
+        jsize arraySize=0, actualPitch;
+        jbyteArray jDstPlanes[3]={NULL, NULL, NULL};
+        unsigned char *srcBuf=NULL, *dstPlanes[3];
+        int *dstOffsets=NULL, *dstStrides=NULL;
+        int nc=(subsamp==org_libjpegturbo_turbojpeg_TJ_SAMP_GRAY? 1:3), i;
+
+        gethandle();
+
         if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF || width<1 || height<1
-                || stride<0)
-                _throw("Invalid argument in compress()");
-        if(org_libjpegturbo_turbojpeg_TJ_NUMPF!=TJ_NUMPF)
-                _throw("Mismatch between Java and C API");
+                || pitch<0 || subsamp<0 || subsamp>=org_libjpegturbo_turbojpeg_TJ_NUMSAMP)
+                _throwarg("Invalid argument in encodeYUV()");
+        if(org_libjpegturbo_turbojpeg_TJ_NUMPF!=TJ_NUMPF
+                || org_libjpegturbo_turbojpeg_TJ_NUMSAMP!=TJ_NUMSAMP)
+                _throwarg("Mismatch between Java and C API");
+
+        if((*env)->GetArrayLength(env, dstobjs)<nc)
+                _throwarg("Planes array is too small for the subsampling type");
+        if((*env)->GetArrayLength(env, jDstOffsets)<nc)
+                _throwarg("Offsets array is too small for the subsampling type");
+        if((*env)->GetArrayLength(env, jDstStrides)<nc)
+                _throwarg("Strides array is too small for the subsampling type");
+
+        actualPitch=(pitch==0)? width*tjPixelSize[pf]:pitch;
+        arraySize=(y+height-1)*actualPitch + (x+width)*tjPixelSize[pf];
+        if((*env)->GetArrayLength(env, src)*srcElementSize<arraySize)
+                _throwarg("Source buffer is not large enough");
+
+        bailif0(dstOffsets=(*env)->GetPrimitiveArrayCritical(env, jDstOffsets, 0));
+        bailif0(dstStrides=(*env)->GetPrimitiveArrayCritical(env, jDstStrides, 0));
+        for(i=0; i<nc; i++)
+        {
+                int planeSize=tjPlaneSizeYUV(i, width, dstStrides[i], height, subsamp);
+                int pw=tjPlaneWidth(i, width, subsamp);
+
+                if(planeSize<0 || pw<0)
+                        _throwarg(tjGetErrorStr());
+
+                if(dstOffsets[i]<0)
+                        _throwarg("Invalid argument in encodeYUV()");
+                if(dstStrides[i]<0 && dstOffsets[i]-planeSize+pw<0)
+                        _throwarg("Negative plane stride would cause memory to be accessed below plane boundary");
+
+                bailif0(jDstPlanes[i]=(*env)->GetObjectArrayElement(env, dstobjs, i));
+                if((*env)->GetArrayLength(env, jDstPlanes[i])<dstOffsets[i]+planeSize)
+                        _throwarg("Destination plane is not large enough");
+
+                bailif0(dstPlanes[i]=(*env)->GetPrimitiveArrayCritical(env, jDstPlanes[i],
+                        0));
+                dstPlanes[i]=&dstPlanes[i][dstOffsets[i]];
+        }
+        bailif0(srcBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0));
+
+        if(tjEncodeYUVPlanes(handle, &srcBuf[y*actualPitch + x*tjPixelSize[pf]],
+                width, pitch, height, pf, dstPlanes, dstStrides, subsamp, flags)==-1)
+                _throwtj();
+
+        bailout:
+        if(srcBuf) (*env)->ReleasePrimitiveArrayCritical(env, src, srcBuf, 0);
+        for(i=0; i<nc; i++)
+        {
+                if(dstPlanes[i] && jDstPlanes[i])
+                        (*env)->ReleasePrimitiveArrayCritical(env, jDstPlanes[i], dstPlanes[i],
+                                0);
+        }
+        if(dstStrides)
+                (*env)->ReleasePrimitiveArrayCritical(env, jDstStrides, dstStrides, 0);
+        if(dstOffsets)
+                (*env)->ReleasePrimitiveArrayCritical(env, jDstOffsets, dstOffsets, 0);
+        return;
+}
+
+/* TurboJPEG 1.4.x: TJCompressor::encodeYUV() byte source */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___3BIIIIII_3_3B_3I_3III
+        (JNIEnv *env, jobject obj, jbyteArray src, jint x, jint y, jint width,
+                jint pitch, jint height, jint pf, jobjectArray dstobjs,
+                jintArray jDstOffsets, jintArray jDstStrides, jint subsamp, jint flags)
+{
+        TJCompressor_encodeYUV(env, obj, src, 1, x, y, width, pitch, height, pf,
+                dstobjs, jDstOffsets, jDstStrides, subsamp, flags);
+}
+
+/* TurboJPEG 1.4.x: TJCompressor::encodeYUV() int source */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___3IIIIIII_3_3B_3I_3III
+        (JNIEnv *env, jobject obj, jintArray src, jint x, jint y, jint width,
+                jint stride, jint height, jint pf, jobjectArray dstobjs,
+                jintArray jDstOffsets, jintArray jDstStrides, jint subsamp, jint flags)
+{
+        if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF)
+                _throwarg("Invalid argument in encodeYUV()");
         if(tjPixelSize[pf]!=sizeof(jint))
-                _throw("Pixel format must be 32-bit when compressing from an integer buffer.");
-
-        actualStride=(stride==0)? width:stride;
-        arraySize=(y+height-1)*actualStride + x+width;
-        if((*env)->GetArrayLength(env, src)<arraySize)
-                _throw("Source buffer is not large enough");
-        jpegSize=tjBufSize(width, height, jpegSubsamp);
-        if((*env)->GetArrayLength(env, dst)<(jsize)jpegSize)
-                _throw("Destination buffer is not large enough");
-
-        bailif0(srcBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0));
-        bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, dst, 0));
-
-        if(tjCompress2(handle, &srcBuf[(y*actualStride + x)*sizeof(int)], width,
-                stride*sizeof(jint), height, pf, &jpegBuf, &jpegSize, jpegSubsamp,
-                jpegQual, flags|TJFLAG_NOREALLOC)==-1)
-        {
-                (*env)->ReleasePrimitiveArrayCritical(env, dst, jpegBuf, 0);
-                (*env)->ReleasePrimitiveArrayCritical(env, src, srcBuf, 0);
-                jpegBuf=srcBuf=NULL;
-                _throw(tjGetErrorStr());
-        }
-
-        bailout:
-        if(jpegBuf) (*env)->ReleasePrimitiveArrayCritical(env, dst, jpegBuf, 0);
-        if(srcBuf) (*env)->ReleasePrimitiveArrayCritical(env, src, srcBuf, 0);
-        return (jint)jpegSize;
-}
-
-JNIEXPORT jint JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3IIIII_3BIII
-        (JNIEnv *env, jobject obj, jintArray src, jint width, jint pitch,
-                jint height, jint pf, jbyteArray dst, jint jpegSubsamp, jint jpegQual,
-                jint flags)
-{
-        return Java_org_libjpegturbo_turbojpeg_TJCompressor_compress___3IIIIIII_3BIII(
-                env, obj, src, 0, 0, width, pitch, height, pf, dst, jpegSubsamp, jpegQual,
-                flags);
-}
-
-JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___3BIIII_3BII
-        (JNIEnv *env, jobject obj, jbyteArray src, jint width, jint pitch,
-                jint height, jint pf, jbyteArray dst, jint subsamp, jint flags)
+                _throwarg("Pixel format must be 32-bit when encoding from an integer buffer.");
+
+        TJCompressor_encodeYUV(env, obj, src, sizeof(jint), x, y, width,
+                stride*sizeof(jint), height, pf, dstobjs, jDstOffsets, jDstStrides,
+                subsamp, flags);
+
+        bailout:
+        return;
+}
+
+JNIEXPORT void JNICALL TJCompressor_encodeYUV_12
+        (JNIEnv *env, jobject obj, jarray src, jint srcElementSize, jint width,
+                jint pitch, jint height, jint pf, jbyteArray dst, jint subsamp, jint flags)
 {
         tjhandle handle=0;
         jsize arraySize=0;
         unsigned char *srcBuf=NULL, *dstBuf=NULL;
 
         gethandle();
 
         if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF || width<1 || height<1
                 || pitch<0)
-                _throw("Invalid argument in encodeYUV()");
+                _throwarg("Invalid argument in encodeYUV()");
         if(org_libjpegturbo_turbojpeg_TJ_NUMPF!=TJ_NUMPF)
-                _throw("Mismatch between Java and C API");
+                _throwarg("Mismatch between Java and C API");
 
         arraySize=(pitch==0)? width*tjPixelSize[pf]*height:pitch*height;
-        if((*env)->GetArrayLength(env, src)<arraySize)
-                _throw("Source buffer is not large enough");
+        if((*env)->GetArrayLength(env, src)*srcElementSize<arraySize)
+                _throwarg("Source buffer is not large enough");
         if((*env)->GetArrayLength(env, dst)
                 <(jsize)tjBufSizeYUV(width, height, subsamp))
-                _throw("Destination buffer is not large enough");
+                _throwarg("Destination buffer is not large enough");
 
         bailif0(srcBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0));
         bailif0(dstBuf=(*env)->GetPrimitiveArrayCritical(env, dst, 0));
 
         if(tjEncodeYUV2(handle, srcBuf, width, pitch, height, pf, dstBuf, subsamp,
                 flags)==-1)
-        {
-                (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0);
-                (*env)->ReleasePrimitiveArrayCritical(env, src, srcBuf, 0);
-                dstBuf=srcBuf=NULL;
-                _throw(tjGetErrorStr());
-        }
+                _throwtj();
 
         bailout:
         if(dstBuf) (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0);
         if(srcBuf) (*env)->ReleasePrimitiveArrayCritical(env, src, srcBuf, 0);
         return;
 }
 
+/* TurboJPEG 1.2.x: TJCompressor::encodeYUV() byte source */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___3BIIII_3BII
+        (JNIEnv *env, jobject obj, jbyteArray src, jint width, jint pitch,
+                jint height, jint pf, jbyteArray dst, jint subsamp, jint flags)
+{
+        TJCompressor_encodeYUV_12(env, obj, src, 1, width, pitch, height, pf, dst,
+                subsamp, flags);
+}
+
+/* TurboJPEG 1.2.x: TJCompressor::encodeYUV() int source */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_encodeYUV___3IIIII_3BII
         (JNIEnv *env, jobject obj, jintArray src, jint width, jint stride,
                 jint height, jint pf, jbyteArray dst, jint subsamp, jint flags)
 {
-        tjhandle handle=0;
-        jsize arraySize=0;
-        unsigned char *srcBuf=NULL, *dstBuf=NULL;
+        if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF)
+                _throwarg("Invalid argument in encodeYUV()");
+        if(tjPixelSize[pf]!=sizeof(jint))
+                _throwarg("Pixel format must be 32-bit when encoding from an integer buffer.");
 
-        gethandle();
-
-        if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF || width<1 || height<1
-                || stride<0)
-                _throw("Invalid argument in encodeYUV()");
-        if(org_libjpegturbo_turbojpeg_TJ_NUMPF!=TJ_NUMPF)
-                _throw("Mismatch between Java and C API");
-        if(tjPixelSize[pf]!=sizeof(jint))
-                _throw("Pixel format must be 32-bit when encoding from an integer buffer.");
-
-        arraySize=(stride==0)? width*height:stride*height;
-        if((*env)->GetArrayLength(env, src)<arraySize)
-                _throw("Source buffer is not large enough");
-        if((*env)->GetArrayLength(env, dst)
-                <(jsize)tjBufSizeYUV(width, height, subsamp))
-                _throw("Destination buffer is not large enough");
-
-        bailif0(srcBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0));
-        bailif0(dstBuf=(*env)->GetPrimitiveArrayCritical(env, dst, 0));
-
-        if(tjEncodeYUV2(handle, srcBuf, width, stride*sizeof(jint), height, pf,
-                dstBuf, subsamp, flags)==-1)
-        {
-                (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0);
-                (*env)->ReleasePrimitiveArrayCritical(env, src, srcBuf, 0);
-                dstBuf=srcBuf=NULL;
-                _throw(tjGetErrorStr());
-        }
+        TJCompressor_encodeYUV_12(env, obj, src, sizeof(jint), width,
+                stride*sizeof(jint), height, pf, dst, subsamp, flags);
 
         bailout:
-        if(dstBuf) (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0);
-        if(srcBuf) (*env)->ReleasePrimitiveArrayCritical(env, src, srcBuf, 0);
         return;
 }
 
+/* TurboJPEG 1.2.x: TJCompressor::destroy() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJCompressor_destroy
         (JNIEnv *env, jobject obj)
 {
         tjhandle handle=0;
 
         gethandle();
 
-        if(tjDestroy(handle)==-1) _throw(tjGetErrorStr());
+        if(tjDestroy(handle)==-1) _throwtj();
         (*env)->SetLongField(env, obj, _fid, 0);
 
         bailout:
         return;
 }
 
+/* TurboJPEG 1.2.x: TJDecompressor::init() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_init
         (JNIEnv *env, jobject obj)
 {
         jclass cls;
         jfieldID fid;
         tjhandle handle;
 
-        if((handle=tjInitDecompress())==NULL) _throw(tjGetErrorStr());
+        if((handle=tjInitDecompress())==NULL) _throwtj();
 
         bailif0(cls=(*env)->GetObjectClass(env, obj));
         bailif0(fid=(*env)->GetFieldID(env, cls, "handle", "J"));
-        (*env)->SetLongField(env, obj, fid, (jlong)handle);
+        (*env)->SetLongField(env, obj, fid, (size_t)handle);
 
         bailout:
         return;
 }
 
+/* TurboJPEG 1.2.x: TJDecompressor::getScalingFactors() */
 JNIEXPORT jobjectArray JNICALL Java_org_libjpegturbo_turbojpeg_TJ_getScalingFactors
         (JNIEnv *env, jclass cls)
 {
-  jclass sfcls=NULL;  jfieldID fid=0;
+        jclass sfcls=NULL;  jfieldID fid=0;
         tjscalingfactor *sf=NULL;  int n=0, i;
         jobject sfobj=NULL;
         jobjectArray sfjava=NULL;
 
         if((sf=tjGetScalingFactors(&n))==NULL || n==0)
-                _throw(tjGetErrorStr());
+                _throwarg(tjGetErrorStr());
 
         bailif0(sfcls=(*env)->FindClass(env, "org/libjpegturbo/turbojpeg/TJScalingFactor"));
         bailif0(sfjava=(jobjectArray)(*env)->NewObjectArray(env, n, sfcls, 0));
 
         for(i=0; i<n; i++)
         {
                 bailif0(sfobj=(*env)->AllocObject(env, sfcls));
                 bailif0(fid=(*env)->GetFieldID(env, sfcls, "num", "I"));
                 (*env)->SetIntField(env, sfobj, fid, sf[i].num);
                 bailif0(fid=(*env)->GetFieldID(env, sfcls, "denom", "I"));
                 (*env)->SetIntField(env, sfobj, fid, sf[i].denom);
                 (*env)->SetObjectArrayElement(env, sfjava, i, sfobj);
         }
 
         bailout:
         return sfjava;
 }
 
+/* TurboJPEG 1.2.x: TJDecompressor::decompressHeader() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompressHeader
         (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize)
 {
         tjhandle handle=0;
         unsigned char *jpegBuf=NULL;
-        int width=0, height=0, jpegSubsamp=-1;
+        int width=0, height=0, jpegSubsamp=-1, jpegColorspace=-1;
 
         gethandle();
 
         if((*env)->GetArrayLength(env, src)<jpegSize)
-                _throw("Source buffer is not large enough");
+                _throwarg("Source buffer is not large enough");
 
         bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0));
 
-        if(tjDecompressHeader2(handle, jpegBuf, (unsigned long)jpegSize, 
-                &width, &height, &jpegSubsamp)==-1)
-        {
-                (*env)->ReleasePrimitiveArrayCritical(env, src, jpegBuf, 0);
-                _throw(tjGetErrorStr());
-        }
+        if(tjDecompressHeader3(handle, jpegBuf, (unsigned long)jpegSize,
+                &width, &height, &jpegSubsamp, &jpegColorspace)==-1)
+                _throwtj();
+
         (*env)->ReleasePrimitiveArrayCritical(env, src, jpegBuf, 0);  jpegBuf=NULL;
 
         bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegSubsamp", "I"));
         (*env)->SetIntField(env, obj, _fid, jpegSubsamp);
+        if((_fid=(*env)->GetFieldID(env, _cls, "jpegColorspace", "I"))==0)
+                (*env)->ExceptionClear(env);
+        else
+                (*env)->SetIntField(env, obj, _fid, jpegColorspace);
         bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegWidth", "I"));
         (*env)->SetIntField(env, obj, _fid, width);
         bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegHeight", "I"));
         (*env)->SetIntField(env, obj, _fid, height);
 
         bailout:
+        if(jpegBuf) (*env)->ReleasePrimitiveArrayCritical(env, src, jpegBuf, 0);
         return;
 }
 
-JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress___3BI_3BIIIIIII
-        (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jbyteArray dst,
-                jint x, jint y, jint width, jint pitch, jint height, jint pf, jint flags)
+static void TJDecompressor_decompress
+        (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jarray dst,
+                jint dstElementSize, jint x, jint y, jint width, jint pitch, jint height,
+                jint pf, jint flags)
 {
         tjhandle handle=0;
         jsize arraySize=0, actualPitch;
         unsigned char *jpegBuf=NULL, *dstBuf=NULL;
 
         gethandle();
 
         if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF)
-                _throw("Invalid argument in decompress()");
+                _throwarg("Invalid argument in decompress()");
         if(org_libjpegturbo_turbojpeg_TJ_NUMPF!=TJ_NUMPF)
-                _throw("Mismatch between Java and C API");
+                _throwarg("Mismatch between Java and C API");
 
         if((*env)->GetArrayLength(env, src)<jpegSize)
-                _throw("Source buffer is not large enough");
+                _throwarg("Source buffer is not large enough");
         actualPitch=(pitch==0)? width*tjPixelSize[pf]:pitch;
         arraySize=(y+height-1)*actualPitch + (x+width)*tjPixelSize[pf];
-        if((*env)->GetArrayLength(env, dst)<arraySize)
-                _throw("Destination buffer is not large enough");
+        if((*env)->GetArrayLength(env, dst)*dstElementSize<arraySize)
+                _throwarg("Destination buffer is not large enough");
 
         bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0));
         bailif0(dstBuf=(*env)->GetPrimitiveArrayCritical(env, dst, 0));
 
         if(tjDecompress2(handle, jpegBuf, (unsigned long)jpegSize,
                 &dstBuf[y*actualPitch + x*tjPixelSize[pf]], width, pitch, height, pf,
                 flags)==-1)
-        {
-                (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0);
-                (*env)->ReleasePrimitiveArrayCritical(env, src, jpegBuf, 0);
-                dstBuf=jpegBuf=NULL;
-                _throw(tjGetErrorStr());
-        }
+                _throwtj();
 
         bailout:
         if(dstBuf) (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0);
         if(jpegBuf) (*env)->ReleasePrimitiveArrayCritical(env, src, jpegBuf, 0);
         return;
 }
 
+/* TurboJPEG 1.3.x: TJDecompressor::decompress() byte destination */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress___3BI_3BIIIIIII
+        (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jbyteArray dst,
+                jint x, jint y, jint width, jint pitch, jint height, jint pf, jint flags)
+{
+        TJDecompressor_decompress(env, obj, src, jpegSize, dst, 1, x, y, width,
+                pitch, height, pf, flags);
+}
+
+/* TurboJPEG 1.2.x: TJDecompressor::decompress() byte destination */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress___3BI_3BIIIII
         (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jbyteArray dst,
                 jint width, jint pitch, jint height, jint pf, jint flags)
 {
-        Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress___3BI_3BIIIIIII
-                (env, obj, src, jpegSize, dst, 0, 0, width, pitch, height, pf, flags);
+        TJDecompressor_decompress(env, obj, src, jpegSize, dst, 1, 0, 0, width,
+                pitch, height, pf, flags);
 }
 
+/* TurboJPEG 1.3.x: TJDecompressor::decompress() int destination */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress___3BI_3IIIIIIII
         (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jintArray dst,
                 jint x, jint y, jint width, jint stride, jint height, jint pf, jint flags)
 {
-        tjhandle handle=0;
-        jsize arraySize=0, actualStride;
-        unsigned char *jpegBuf=NULL, *dstBuf=NULL;
+        if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF)
+                _throwarg("Invalid argument in decompress()");
+        if(tjPixelSize[pf]!=sizeof(jint))
+                _throwarg("Pixel format must be 32-bit when decompressing to an integer buffer.");
 
-        gethandle();
-
-        if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF)
-                _throw("Invalid argument in decompress()");
-        if(org_libjpegturbo_turbojpeg_TJ_NUMPF!=TJ_NUMPF)
-                _throw("Mismatch between Java and C API");
-        if(tjPixelSize[pf]!=sizeof(jint))
-                _throw("Pixel format must be 32-bit when decompressing to an integer buffer.");
-
-        if((*env)->GetArrayLength(env, src)<jpegSize)
-                _throw("Source buffer is not large enough");
-        actualStride=(stride==0)? width:stride;
-        arraySize=(y+height-1)*actualStride + x+width;
-        if((*env)->GetArrayLength(env, dst)<arraySize)
-                _throw("Destination buffer is not large enough");
-
-        bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0));
-        bailif0(dstBuf=(*env)->GetPrimitiveArrayCritical(env, dst, 0));
-
-        if(tjDecompress2(handle, jpegBuf, (unsigned long)jpegSize,
-                &dstBuf[(y*actualStride + x)*sizeof(int)], width, stride*sizeof(jint),
-                height, pf, flags)==-1)
-        {
-                (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0);
-                (*env)->ReleasePrimitiveArrayCritical(env, src, jpegBuf, 0);
-                dstBuf=jpegBuf=NULL;
-                _throw(tjGetErrorStr());
-        }
+        TJDecompressor_decompress(env, obj, src, jpegSize, dst, sizeof(jint), x, y,
+                width, stride*sizeof(jint), height, pf, flags);
 
         bailout:
-        if(dstBuf) (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0);
-        if(jpegBuf) (*env)->ReleasePrimitiveArrayCritical(env, src, jpegBuf, 0);
         return;
 }
 
+/* TurboJPEG 1.2.x: TJDecompressor::decompress() int destination */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress___3BI_3IIIIII
         (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jintArray dst,
                 jint width, jint stride, jint height, jint pf, jint flags)
 {
-        Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompress___3BI_3IIIIIIII
-                (env, obj, src, jpegSize, dst, 0, 0, width, stride, height, pf, flags);
-        
+        if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF)
+                _throwarg("Invalid argument in decompress()");
+        if(tjPixelSize[pf]!=sizeof(jint))
+                _throwarg("Pixel format must be 32-bit when decompressing to an integer buffer.");
+
+        TJDecompressor_decompress(env, obj, src, jpegSize, dst, sizeof(jint), 0, 0,
+                width, stride*sizeof(jint), height, pf, flags);
+
+        bailout:
+        return;
+
 }
 
-JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompressToYUV
+/* TurboJPEG 1.4.x: TJDecompressor::decompressToYUV() */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompressToYUV___3BI_3_3B_3II_3III
+        (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize,
+                jobjectArray dstobjs, jintArray jDstOffsets, jint desiredWidth,
+                jintArray jDstStrides, jint desiredHeight, jint flags)
+{
+        tjhandle handle=0;
+        jbyteArray jDstPlanes[3]={NULL, NULL, NULL};
+        unsigned char *jpegBuf=NULL, *dstPlanes[3];
+        int *dstOffsets=NULL, *dstStrides=NULL;
+        int jpegSubsamp=-1, jpegWidth=0, jpegHeight=0;
+        int nc=0, i, width, height, scaledWidth, scaledHeight, nsf=0;
+        tjscalingfactor *sf;
+
+
+        gethandle();
+
+        if((*env)->GetArrayLength(env, src)<jpegSize)
+                _throwarg("Source buffer is not large enough");
+        bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegSubsamp", "I"));
+        jpegSubsamp=(int)(*env)->GetIntField(env, obj, _fid);
+        bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegWidth", "I"));
+        jpegWidth=(int)(*env)->GetIntField(env, obj, _fid);
+        bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegHeight", "I"));
+        jpegHeight=(int)(*env)->GetIntField(env, obj, _fid);
+
+        nc=(jpegSubsamp==org_libjpegturbo_turbojpeg_TJ_SAMP_GRAY? 1:3);
+
+        width=desiredWidth;  height=desiredHeight;
+        if(width==0) width=jpegWidth;
+        if(height==0) height=jpegHeight;
+        sf=tjGetScalingFactors(&nsf);
+        if(!sf || nsf<1)
+                _throwarg(tjGetErrorStr());
+        for(i=0; i<nsf; i++)
+        {
+                scaledWidth=TJSCALED(jpegWidth, sf[i]);
+                scaledHeight=TJSCALED(jpegHeight, sf[i]);
+                if(scaledWidth<=width && scaledHeight<=height)
+                        break;
+        }
+        if(i>=nsf)
+                _throwarg("Could not scale down to desired image dimensions");
+
+        bailif0(dstOffsets=(*env)->GetPrimitiveArrayCritical(env, jDstOffsets, 0));
+        bailif0(dstStrides=(*env)->GetPrimitiveArrayCritical(env, jDstStrides, 0));
+        for(i=0; i<nc; i++)
+        {
+                int planeSize=tjPlaneSizeYUV(i, scaledWidth, dstStrides[i], scaledHeight,
+                        jpegSubsamp);
+                int pw=tjPlaneWidth(i, scaledWidth, jpegSubsamp);
+
+                if(planeSize<0 || pw<0)
+                        _throwarg(tjGetErrorStr());
+
+                if(dstOffsets[i]<0)
+                        _throwarg("Invalid argument in decompressToYUV()");
+                if(dstStrides[i]<0 && dstOffsets[i]-planeSize+pw<0)
+                        _throwarg("Negative plane stride would cause memory to be accessed below plane boundary");
+
+                bailif0(jDstPlanes[i]=(*env)->GetObjectArrayElement(env, dstobjs, i));
+                if((*env)->GetArrayLength(env, jDstPlanes[i])<dstOffsets[i]+planeSize)
+                        _throwarg("Destination plane is not large enough");
+
+                bailif0(dstPlanes[i]=(*env)->GetPrimitiveArrayCritical(env, jDstPlanes[i],
+                        0));
+                dstPlanes[i]=&dstPlanes[i][dstOffsets[i]];
+        }
+        bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0));
+
+        if(tjDecompressToYUVPlanes(handle, jpegBuf, (unsigned long)jpegSize,
+                dstPlanes, desiredWidth, dstStrides, desiredHeight, flags)==-1)
+                _throwtj();
+
+        bailout:
+        if(jpegBuf) (*env)->ReleasePrimitiveArrayCritical(env, src, jpegBuf, 0);
+        for(i=0; i<nc; i++)
+        {
+                if(dstPlanes[i] && jDstPlanes[i])
+                        (*env)->ReleasePrimitiveArrayCritical(env, jDstPlanes[i], dstPlanes[i],
+                                0);
+        }
+        if(dstStrides)
+                (*env)->ReleasePrimitiveArrayCritical(env, jDstStrides, dstStrides, 0);
+        if(dstOffsets)
+                (*env)->ReleasePrimitiveArrayCritical(env, jDstOffsets, dstOffsets, 0);
+        return;
+}
+
+/* TurboJPEG 1.2.x: TJDecompressor::decompressToYUV() */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decompressToYUV___3BI_3BI
         (JNIEnv *env, jobject obj, jbyteArray src, jint jpegSize, jbyteArray dst,
                 jint flags)
 {
         tjhandle handle=0;
         unsigned char *jpegBuf=NULL, *dstBuf=NULL;
         int jpegSubsamp=-1, jpegWidth=0, jpegHeight=0;
 
         gethandle();
 
         if((*env)->GetArrayLength(env, src)<jpegSize)
-                _throw("Source buffer is not large enough");
+                _throwarg("Source buffer is not large enough");
         bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegSubsamp", "I"));
         jpegSubsamp=(int)(*env)->GetIntField(env, obj, _fid);
         bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegWidth", "I"));
         jpegWidth=(int)(*env)->GetIntField(env, obj, _fid);
         bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegHeight", "I"));
         jpegHeight=(int)(*env)->GetIntField(env, obj, _fid);
         if((*env)->GetArrayLength(env, dst)
                 <(jsize)tjBufSizeYUV(jpegWidth, jpegHeight, jpegSubsamp))
-                _throw("Destination buffer is not large enough");
+                _throwarg("Destination buffer is not large enough");
 
         bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, src, 0));
         bailif0(dstBuf=(*env)->GetPrimitiveArrayCritical(env, dst, 0));
 
         if(tjDecompressToYUV(handle, jpegBuf, (unsigned long)jpegSize, dstBuf,
                 flags)==-1)
-        {
-                (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0);
-                (*env)->ReleasePrimitiveArrayCritical(env, src, jpegBuf, 0);
-                dstBuf=jpegBuf=NULL;
-                _throw(tjGetErrorStr());
-        }
+                _throwtj();
 
         bailout:
         if(dstBuf) (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0);
         if(jpegBuf) (*env)->ReleasePrimitiveArrayCritical(env, src, jpegBuf, 0);
         return;
 }
 
+static void TJDecompressor_decodeYUV
+        (JNIEnv *env, jobject obj, jobjectArray srcobjs, jintArray jSrcOffsets,
+                jintArray jSrcStrides, jint subsamp, jarray dst, jint dstElementSize,
+                jint x, jint y, jint width, jint pitch, jint height, jint pf, jint flags)
+{
+        tjhandle handle=0;
+        jsize arraySize=0, actualPitch;
+        jbyteArray jSrcPlanes[3]={NULL, NULL, NULL};
+        const unsigned char *srcPlanes[3];
+        unsigned char *dstBuf=NULL;
+        int *srcOffsets=NULL, *srcStrides=NULL;
+        int nc=(subsamp==org_libjpegturbo_turbojpeg_TJ_SAMP_GRAY? 1:3), i;
+
+        gethandle();
+
+        if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF || subsamp<0
+                || subsamp>=org_libjpegturbo_turbojpeg_TJ_NUMSAMP)
+                _throwarg("Invalid argument in decodeYUV()");
+        if(org_libjpegturbo_turbojpeg_TJ_NUMPF!=TJ_NUMPF
+                || org_libjpegturbo_turbojpeg_TJ_NUMSAMP!=TJ_NUMSAMP)
+                _throwarg("Mismatch between Java and C API");
+
+        if((*env)->GetArrayLength(env, srcobjs)<nc)
+                _throwarg("Planes array is too small for the subsampling type");
+        if((*env)->GetArrayLength(env, jSrcOffsets)<nc)
+                _throwarg("Offsets array is too small for the subsampling type");
+        if((*env)->GetArrayLength(env, jSrcStrides)<nc)
+                _throwarg("Strides array is too small for the subsampling type");
+
+        actualPitch=(pitch==0)? width*tjPixelSize[pf]:pitch;
+        arraySize=(y+height-1)*actualPitch + (x+width)*tjPixelSize[pf];
+        if((*env)->GetArrayLength(env, dst)*dstElementSize<arraySize)
+                _throwarg("Destination buffer is not large enough");
+
+        bailif0(srcOffsets=(*env)->GetPrimitiveArrayCritical(env, jSrcOffsets, 0));
+        bailif0(srcStrides=(*env)->GetPrimitiveArrayCritical(env, jSrcStrides, 0));
+        for(i=0; i<nc; i++)
+        {
+                int planeSize=tjPlaneSizeYUV(i, width, srcStrides[i], height, subsamp);
+                int pw=tjPlaneWidth(i, width, subsamp);
+
+                if(planeSize<0 || pw<0)
+                        _throwarg(tjGetErrorStr());
+
+                if(srcOffsets[i]<0)
+                        _throwarg("Invalid argument in decodeYUV()");
+                if(srcStrides[i]<0 && srcOffsets[i]-planeSize+pw<0)
+                        _throwarg("Negative plane stride would cause memory to be accessed below plane boundary");
+
+                bailif0(jSrcPlanes[i]=(*env)->GetObjectArrayElement(env, srcobjs, i));
+                if((*env)->GetArrayLength(env, jSrcPlanes[i])<srcOffsets[i]+planeSize)
+                        _throwarg("Source plane is not large enough");
+
+                bailif0(srcPlanes[i]=(*env)->GetPrimitiveArrayCritical(env, jSrcPlanes[i],
+                        0));
+                srcPlanes[i]=&srcPlanes[i][srcOffsets[i]];
+        }
+        bailif0(dstBuf=(*env)->GetPrimitiveArrayCritical(env, dst, 0));
+
+        if(tjDecodeYUVPlanes(handle, srcPlanes, srcStrides, subsamp,
+                &dstBuf[y*actualPitch + x*tjPixelSize[pf]], width, pitch, height, pf,
+                flags)==-1)
+                _throwtj();
+
+        bailout:
+        if(dstBuf) (*env)->ReleasePrimitiveArrayCritical(env, dst, dstBuf, 0);
+        for(i=0; i<nc; i++)
+        {
+                if(srcPlanes[i] && jSrcPlanes[i])
+                        (*env)->ReleasePrimitiveArrayCritical(env, jSrcPlanes[i],
+                                (unsigned char *)srcPlanes[i], 0);
+        }
+        if(srcStrides)
+                (*env)->ReleasePrimitiveArrayCritical(env, jSrcStrides, srcStrides, 0);
+        if(srcOffsets)
+                (*env)->ReleasePrimitiveArrayCritical(env, jSrcOffsets, srcOffsets, 0);
+        return;
+}
+
+/* TurboJPEG 1.4.x: TJDecompressor::decodeYUV() byte destination */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decodeYUV___3_3B_3I_3II_3BIIIIIII
+        (JNIEnv *env, jobject obj, jobjectArray srcobjs, jintArray jSrcOffsets,
+                jintArray jSrcStrides, jint subsamp, jbyteArray dst, jint x, jint y,
+                jint width, jint pitch, jint height, jint pf, jint flags)
+{
+        TJDecompressor_decodeYUV(env, obj, srcobjs, jSrcOffsets, jSrcStrides,
+                subsamp, dst, 1, x, y, width, pitch, height, pf, flags);
+}
+
+/* TurboJPEG 1.4.x: TJDecompressor::decodeYUV() int destination */
+JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_decodeYUV___3_3B_3I_3II_3IIIIIIII
+        (JNIEnv *env, jobject obj, jobjectArray srcobjs, jintArray jSrcOffsets,
+                jintArray jSrcStrides, jint subsamp, jintArray dst, jint x, jint y,
+                jint width, jint stride, jint height, jint pf, jint flags)
+{
+        if(pf<0 || pf>=org_libjpegturbo_turbojpeg_TJ_NUMPF)
+                _throwarg("Invalid argument in decodeYUV()");
+        if(tjPixelSize[pf]!=sizeof(jint))
+                _throwarg("Pixel format must be 32-bit when decoding to an integer buffer.");
+
+        TJDecompressor_decodeYUV(env, obj, srcobjs, jSrcOffsets, jSrcStrides,
+                subsamp, dst, sizeof(jint), x, y, width, stride*sizeof(jint), height, pf,
+                flags);
+
+        bailout:
+        return;
+}
+
+/* TurboJPEG 1.2.x: TJTransformer::init() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_init
         (JNIEnv *env, jobject obj)
 {
         jclass cls;
         jfieldID fid;
         tjhandle handle;
 
-        if((handle=tjInitTransform())==NULL) _throw(tjGetErrorStr());
+        if((handle=tjInitTransform())==NULL) _throwtj();
 
         bailif0(cls=(*env)->GetObjectClass(env, obj));
         bailif0(fid=(*env)->GetFieldID(env, cls, "handle", "J"));
-        (*env)->SetLongField(env, obj, fid, (jlong)handle);
+        (*env)->SetLongField(env, obj, fid, (size_t)handle);
 
         bailout:
         return;
 }
 
 typedef struct _JNICustomFilterParams
 {
         JNIEnv *env;
         jobject tobj;
         jobject cfobj;
 } JNICustomFilterParams;
 
 static int JNICustomFilter(short *coeffs, tjregion arrayRegion,
         tjregion planeRegion, int componentIndex, int transformIndex,
         tjtransform *transform)
 {
         JNICustomFilterParams *params=(JNICustomFilterParams *)transform->data;
         JNIEnv *env=params->env;
         jobject tobj=params->tobj, cfobj=params->cfobj;
-  jobject arrayRegionObj, planeRegionObj, bufobj, borobj;
+        jobject arrayRegionObj, planeRegionObj, bufobj, borobj;
         jclass cls;  jmethodID mid;  jfieldID fid;
 
         bailif0(bufobj=(*env)->NewDirectByteBuffer(env, coeffs,
                 sizeof(short)*arrayRegion.w*arrayRegion.h));
         bailif0(cls=(*env)->FindClass(env, "java/nio/ByteOrder"));
-  bailif0(mid=(*env)->GetStaticMethodID(env, cls, "nativeOrder",
+        bailif0(mid=(*env)->GetStaticMethodID(env, cls, "nativeOrder",
                 "()Ljava/nio/ByteOrder;"));
         bailif0(borobj=(*env)->CallStaticObjectMethod(env, cls, mid));
         bailif0(cls=(*env)->GetObjectClass(env, bufobj));
         bailif0(mid=(*env)->GetMethodID(env, cls, "order",
                 "(Ljava/nio/ByteOrder;)Ljava/nio/ByteBuffer;"));
         (*env)->CallObjectMethod(env, bufobj, mid, borobj);
-  bailif0(mid=(*env)->GetMethodID(env, cls, "asShortBuffer",
+        bailif0(mid=(*env)->GetMethodID(env, cls, "asShortBuffer",
                 "()Ljava/nio/ShortBuffer;"));
         bailif0(bufobj=(*env)->CallObjectMethod(env, bufobj, mid));
 
         bailif0(cls=(*env)->FindClass(env, "java/awt/Rectangle"));
         bailif0(arrayRegionObj=(*env)->AllocObject(env, cls));
         bailif0(fid=(*env)->GetFieldID(env, cls, "x", "I"));
         (*env)->SetIntField(env, arrayRegionObj, fid, arrayRegion.x);
         bailif0(fid=(*env)->GetFieldID(env, cls, "y", "I"));
         (*env)->SetIntField(env, arrayRegionObj, fid, arrayRegion.y);
         bailif0(fid=(*env)->GetFieldID(env, cls, "width", "I"));
@@ skipping 16 matching lines @@
                 "(Ljava/nio/ShortBuffer;Ljava/awt/Rectangle;Ljava/awt/Rectangle;IILorg/libjpegturbo/turbojpeg/TJTransform;)V"));
         (*env)->CallVoidMethod(env, cfobj, mid, bufobj, arrayRegionObj,
                 planeRegionObj, componentIndex, transformIndex, tobj);
 
         return 0;
 
         bailout:
         return -1;
 }
 
+/* TurboJPEG 1.2.x: TJTransformer::transform() */
 JNIEXPORT jintArray JNICALL Java_org_libjpegturbo_turbojpeg_TJTransformer_transform
         (JNIEnv *env, jobject obj, jbyteArray jsrcBuf, jint jpegSize,
                 jobjectArray dstobjs, jobjectArray tobjs, jint flags)
 {
         tjhandle handle=0;  int i;
         unsigned char *jpegBuf=NULL, **dstBufs=NULL;  jsize n=0;
         unsigned long *dstSizes=NULL;  tjtransform *t=NULL;
         jbyteArray *jdstBufs=NULL;
         int jpegWidth=0, jpegHeight=0, jpegSubsamp;
         jintArray jdstSizes=0;  jint *dstSizesi=NULL;
         JNICustomFilterParams *params=NULL;
 
         gethandle();
 
         if((*env)->GetArrayLength(env, jsrcBuf)<jpegSize)
-                _throw("Source buffer is not large enough");
+                _throwarg("Source buffer is not large enough");
         bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegWidth", "I"));
         jpegWidth=(int)(*env)->GetIntField(env, obj, _fid);
         bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegHeight", "I"));
         jpegHeight=(int)(*env)->GetIntField(env, obj, _fid);
         bailif0(_fid=(*env)->GetFieldID(env, _cls, "jpegSubsamp", "I"));
         jpegSubsamp=(int)(*env)->GetIntField(env, obj, _fid);
 
         n=(*env)->GetArrayLength(env, dstobjs);
         if(n!=(*env)->GetArrayLength(env, tobjs))
-                _throw("Mismatch between size of transforms array and destination buffers array");
+                _throwarg("Mismatch between size of transforms array and destination buffers array");
 
         if((dstBufs=(unsigned char **)malloc(sizeof(unsigned char *)*n))==NULL)
-                _throw("Memory allocation failure");
+                _throwmem();
         if((jdstBufs=(jbyteArray *)malloc(sizeof(jbyteArray)*n))==NULL)
-                _throw("Memory allocation failure");
+                _throwmem();
         if((dstSizes=(unsigned long *)malloc(sizeof(unsigned long)*n))==NULL)
-                _throw("Memory allocation failure");
+                _throwmem();
         if((t=(tjtransform *)malloc(sizeof(tjtransform)*n))==NULL)
-                _throw("Memory allocation failure");
+                _throwmem();
         if((params=(JNICustomFilterParams *)malloc(sizeof(JNICustomFilterParams)*n))
                 ==NULL)
-                _throw("Memory allocation failure");
+                _throwmem();
         for(i=0; i<n; i++)
         {
                 dstBufs[i]=NULL;  jdstBufs[i]=NULL;  dstSizes[i]=0;
                 memset(&t[i], 0, sizeof(tjtransform));
                 memset(&params[i], 0, sizeof(JNICustomFilterParams));
         }
 
         for(i=0; i<n; i++)
         {
                 jobject tobj, cfobj;
@@ skipping 19 matching lines @@
                 if(cfobj)
                 {
                         params[i].env=env;
                         params[i].tobj=tobj;
                         params[i].cfobj=cfobj;
                         t[i].customFilter=JNICustomFilter;
                         t[i].data=(void *)&params[i];
                 }
         }
 
-        bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, jsrcBuf, 0));
         for(i=0; i<n; i++)
         {
                 int w=jpegWidth, h=jpegHeight;
                 if(t[i].r.w!=0) w=t[i].r.w;
                 if(t[i].r.h!=0) h=t[i].r.h;
                 bailif0(jdstBufs[i]=(*env)->GetObjectArrayElement(env, dstobjs, i));
                 if((unsigned long)(*env)->GetArrayLength(env, jdstBufs[i])
                         <tjBufSize(w, h, jpegSubsamp))
-                        _throw("Destination buffer is not large enough");
+                        _throwarg("Destination buffer is not large enough");
+        }
+        bailif0(jpegBuf=(*env)->GetPrimitiveArrayCritical(env, jsrcBuf, 0));
+        for(i=0; i<n; i++)
                 bailif0(dstBufs[i]=(*env)->GetPrimitiveArrayCritical(env, jdstBufs[i], 0));
-        }
 
         if(tjTransform(handle, jpegBuf, jpegSize, n, dstBufs, dstSizes, t,
                 flags|TJFLAG_NOREALLOC)==-1)
+                _throwtj();
+
+        for(i=0; i<n; i++)
         {
-                (*env)->ReleasePrimitiveArrayCritical(env, jsrcBuf, jpegBuf, 0);
-                jpegBuf=NULL;
-                for(i=0; i<n; i++)
-                {
-                        (*env)->ReleasePrimitiveArrayCritical(env, jdstBufs[i], dstBufs[i], 0);
-                        dstBufs[i]=NULL;
-                }
-                _throw(tjGetErrorStr());
+                (*env)->ReleasePrimitiveArrayCritical(env, jdstBufs[i], dstBufs[i], 0);
+                dstBufs[i]=NULL;
         }
+        (*env)->ReleasePrimitiveArrayCritical(env, jsrcBuf, jpegBuf, 0);
+        jpegBuf=NULL;
 
         jdstSizes=(*env)->NewIntArray(env, n);
         bailif0(dstSizesi=(*env)->GetIntArrayElements(env, jdstSizes, 0));
         for(i=0; i<n; i++) dstSizesi[i]=(int)dstSizes[i];
 
         bailout:
-        if(jpegBuf) (*env)->ReleasePrimitiveArrayCritical(env, jsrcBuf, jpegBuf, 0);
+        if(dstSizesi) (*env)->ReleaseIntArrayElements(env, jdstSizes, dstSizesi, 0);
         if(dstBufs)
         {
                 for(i=0; i<n; i++)
                 {
                         if(dstBufs[i] && jdstBufs && jdstBufs[i])
                                 (*env)->ReleasePrimitiveArrayCritical(env, jdstBufs[i], dstBufs[i], 0);
                 }
                 free(dstBufs);
         }
+        if(jpegBuf) (*env)->ReleasePrimitiveArrayCritical(env, jsrcBuf, jpegBuf, 0);
         if(jdstBufs) free(jdstBufs);
         if(dstSizes) free(dstSizes);
-        if(dstSizesi) (*env)->ReleaseIntArrayElements(env, jdstSizes, dstSizesi, 0);
         if(t) free(t);
         return jdstSizes;
 }
 
+/* TurboJPEG 1.2.x: TJDecompressor::destroy() */
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_destroy
         (JNIEnv *env, jobject obj)
 {
         Java_org_libjpegturbo_turbojpeg_TJCompressor_destroy(env, obj);
 }