Ticket #6225: JavaOpenJPEGMacOSX.patch

applications/jpip/opj_client/opj_dec_server/Makefile.am

@@ -4 +4 @@
 
 opj_dec_server_CPPFLAGS = \
 -I. \
+-I$(top_builddir)/libopenjpeg \
 -I$(top_srcdir)/applications/jpip/opj_server \
 -I$(top_builddir)/applications/jpip/opj_server \
 -I$(top_srcdir)/applications/jpip/libopenjpip \

applications/JavaOpenJPEG/JavaOpenJPEG.c

@@ -36 +36 @@
 #include <jni.h>
 #include <math.h>
 
+#include "bool.h"
 #include "openjpeg.h"
 #include "getopt.h"
 #include "convert.h"
@@ -43 +44 @@
 #include "dirent.h"
 #include "org_openJpeg_OpenJPEGJavaEncoder.h"
 
+#ifndef max
+    #define max( a, b ) ( ((a) > (b)) ? (a) : (b) )
+#endif
+
+#ifndef min
+    #define min( a, b ) ( ((a) < (b)) ? (a) : (b) )
+#endif
+
 #ifndef _WIN32
 #define stricmp strcasecmp
 #define strnicmp strncasecmp
@@ -1616 +1625 @@
         jbyte           *jbBody;
         jshort          *jsBody;
         jint            *jiBody;
-        boolean         isCopy;
+        jboolean        isCopy;
 
         // Image width, height and depth
         fid = (*env)->GetFieldID(env, cls,"width", "I");

applications/JavaOpenJPEG/Makefile

@@ -4 +4 @@
 
 all: j2k_to_image image_to_j2k
 
-j2k_to_image: j2k_to_image.c ../libopenjpeg.a
-        gcc $(CFLAGS) ../common/getopt.c convert.c j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
+j2k_to_image: ../codec/j2k_to_image.c ../../libopenjpeg/libopenjpeg.la
+        gcc $(CFLAGS) ../common/getopt.c ../codec/convert.c ../codec/j2k_to_image.c -o j2k_to_image -L.. -lopenjpeg -I ../../ -I ../../libopenjpeg/ -lm -ltiff
 
-image_to_j2k: image_to_j2k.c ../libopenjpeg.a
-        gcc $(CFLAGS) ../common/getopt.c convert.c image_to_j2k.c -o image_to_j2k -L.. -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
+image_to_j2k: ../codec/image_to_j2k.c ../../libopenjpeg/libopenjpeg.a
+        gcc $(CFLAGS) ../common/getopt.c ../codec/convert.c ../codec/image_to_j2k.c -o image_to_j2k -L../../libopenjpeg/.libs/ -lopenjpeg -I ../../ -I ../../libopenjpeg/ -lm -ltiff
 
+jni: JavaOpenJPEG.c JavaOpenJPEGDecoder.c
+        gcc $(CFLAGS) -o libJavaOpenJPEG.so -shared -I /System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -I ../codec/ -I ../../libopenjpeg/ -I ../common/ -I../../ -I /opt/local/include -I. -L/opt/local/lib/ -L../../libopenjpeg/.libs/ -lopenjpeg -lpng -lm ../codec/convert.c ../common/getopt.c ../codec/index.c JavaOpenJPEG.c JavaOpenJPEGDecoder.c
+
 clean:
         rm -f j2k_to_image image_to_j2k