Update libjpeg-turbo to r722.

turbojpeg-jni.c

 /*
  * Copyright (C)2011 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
@@ skipping 469 matching lines @@
         if((handle=tjInitTransform())==NULL) _throw(tjGetErrorStr());
 
         bailif0(cls=(*env)->GetObjectClass(env, obj));
         bailif0(fid=(*env)->GetFieldID(env, cls, "handle", "J"));
         (*env)->SetLongField(env, obj, fid, (jlong)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;
+        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",
+                "()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",
+                "()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"));
+        (*env)->SetIntField(env, arrayRegionObj, fid, arrayRegion.w);
+        bailif0(fid=(*env)->GetFieldID(env, cls, "height", "I"));
+        (*env)->SetIntField(env, arrayRegionObj, fid, arrayRegion.h);
+
+        bailif0(planeRegionObj=(*env)->AllocObject(env, cls));
+        bailif0(fid=(*env)->GetFieldID(env, cls, "x", "I"));
+        (*env)->SetIntField(env, planeRegionObj, fid, planeRegion.x);
+        bailif0(fid=(*env)->GetFieldID(env, cls, "y", "I"));
+        (*env)->SetIntField(env, planeRegionObj, fid, planeRegion.y);
+        bailif0(fid=(*env)->GetFieldID(env, cls, "width", "I"));
+        (*env)->SetIntField(env, planeRegionObj, fid, planeRegion.w);
+        bailif0(fid=(*env)->GetFieldID(env, cls, "height", "I"));
+        (*env)->SetIntField(env, planeRegionObj, fid, planeRegion.h);
+
+        bailif0(cls=(*env)->GetObjectClass(env, cfobj));
+        bailif0(mid=(*env)->GetMethodID(env, cls, "customFilter",
+                "(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;
+}
+
 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");
         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");
 
         if((dstBufs=(unsigned char **)malloc(sizeof(unsigned char *)*n))==NULL)
                 _throw("Memory allocation failure");
         if((jdstBufs=(jbyteArray *)malloc(sizeof(jbyteArray)*n))==NULL)
                 _throw("Memory allocation failure");
         if((dstSizes=(unsigned long *)malloc(sizeof(unsigned long)*n))==NULL)
                 _throw("Memory allocation failure");
         if((t=(tjtransform *)malloc(sizeof(tjtransform)*n))==NULL)
                 _throw("Memory allocation failure");
+        if((params=(JNICustomFilterParams *)malloc(sizeof(JNICustomFilterParams)*n))
+                ==NULL)
+                _throw("Memory allocation failure");
         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;
+                jobject tobj, cfobj;
 
                 bailif0(tobj=(*env)->GetObjectArrayElement(env, tobjs, i));
                 bailif0(_cls=(*env)->GetObjectClass(env, tobj));
                 bailif0(_fid=(*env)->GetFieldID(env, _cls, "op", "I"));
                 t[i].op=(*env)->GetIntField(env, tobj, _fid);
                 bailif0(_fid=(*env)->GetFieldID(env, _cls, "options", "I"));
                 t[i].options=(*env)->GetIntField(env, tobj, _fid);
                 bailif0(_fid=(*env)->GetFieldID(env, _cls, "x", "I"));
                 t[i].r.x=(*env)->GetIntField(env, tobj, _fid);
                 bailif0(_fid=(*env)->GetFieldID(env, _cls, "y", "I"));
                 t[i].r.y=(*env)->GetIntField(env, tobj, _fid);
                 bailif0(_fid=(*env)->GetFieldID(env, _cls, "width", "I"));
                 t[i].r.w=(*env)->GetIntField(env, tobj, _fid);
                 bailif0(_fid=(*env)->GetFieldID(env, _cls, "height", "I"));
                 t[i].r.h=(*env)->GetIntField(env, tobj, _fid);
+
+                bailif0(_fid=(*env)->GetFieldID(env, _cls, "cf",
+                        "Lorg/libjpegturbo/turbojpeg/TJCustomFilter;"));
+                cfobj=(*env)->GetObjectField(env, tobj, _fid);
+                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((*env)->GetArrayLength(env, jdstBufs[i])<tjBufSize(w, h, jpegSubsamp))
@@ skipping 34 matching lines @@
         if(dstSizesi) (*env)->ReleaseIntArrayElements(env, jdstSizes, dstSizesi, 0);
         if(t) free(t);
         return jdstSizes;
 }
 
 JNIEXPORT void JNICALL Java_org_libjpegturbo_turbojpeg_TJDecompressor_destroy
         (JNIEnv *env, jobject obj)
 {
         Java_org_libjpegturbo_turbojpeg_TJCompressor_destroy(env, obj);
 }