removed LCMS dependency in jp3d/libjp3dvm/CMakeLists.txt

[openjpeg.git] / JavaOpenJPEG / JavaOpenJPEGDecoder.c

diff --git a/JavaOpenJPEG/JavaOpenJPEGDecoder.c b/JavaOpenJPEG/JavaOpenJPEGDecoder.c
index a33fe9db81000cd34b27faf6d75ee2adbc08e9f8..decc1373d122e623a434789dcab0129d6bcc2a95 100644 (file)
--- a/JavaOpenJPEG/JavaOpenJPEGDecoder.c
+++ b/JavaOpenJPEG/JavaOpenJPEGDecoder.c
@@ -37,31 +37,17 @@
 #include <math.h>\r
 \r
 #include "openjpeg.h"\r
-#include "compat/getopt.h"\r
+#include "getopt.h"\r
 #include "convert.h"\r
 #include "dirent.h"\r
 #include "org_openJpeg_OpenJPEGJavaDecoder.h"\r
 \r
-#ifndef WIN32\r
+#ifndef _WIN32\r
 #define stricmp strcasecmp\r
 #define strnicmp strncasecmp\r
 #endif\r
 \r
-/* ----------------------------------------------------------------------- */\r
-\r
-#define J2K_CFMT 0\r
-#define JP2_CFMT 1\r
-#define JPT_CFMT 2\r
-\r
-#define PXM_DFMT 10\r
-#define PGX_DFMT 11\r
-#define BMP_DFMT 12\r
-#define YUV_DFMT 13\r
-#define TIF_DFMT 14\r
-#define RAW_DFMT 15\r
-#define TGA_DFMT 16\r
-\r
-/* ----------------------------------------------------------------------- */\r
+#include "format_defs.h"\r
 \r
 typedef struct callback_variables {\r
        JNIEnv *env;\r
@@ -782,13 +768,13 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
                        ptr2 = image->comps[2].data;\r
 #ifdef CHECK_THRESHOLDS \r
                        if (image->comps[0].sgnd) {\r
-                               min_value = 0;\r
-                               max_value = 255;\r
-                       } else {\r
                                min_value = -128;\r
                                max_value = 127;\r
+                       } else {\r
+                               min_value = 0;\r
+                               max_value = 255;\r
                        }\r
-#endif\r
+#endif                 \r
                        // Get the pointer to the Java structure where the data must be copied\r
                        fid = (*env)->GetFieldID(env, cls,"image24", "[I");\r
                        jia = (*env)->GetObjectField(env, obj, fid);\r
@@ -828,13 +814,13 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
                                ptrBBody = jbBody;\r
 #ifdef CHECK_THRESHOLDS \r
                                if (image->comps[0].sgnd) {\r
-                                       min_value = 0;\r
-                                       max_value = 255;\r
-                               } else {\r
                                        min_value = -128;\r
                                        max_value = 127;\r
+                               } else {\r
+                                       min_value = 0;\r
+                                       max_value = 255;\r
                                }\r
-#endif                         \r
+#endif                                                         \r
                                //printf("C: transfering %d shorts to Java image8 pointer = %d\n", wr*hr,ptrSBody);\r
                                for (i=0; i<w*h; i++) {\r
                                        tempUC = (unsigned char) (ptr[i]);\r
@@ -855,11 +841,11 @@ JNIEXPORT jint JNICALL Java_org_openJpeg_OpenJPEGJavaDecoder_internalDecodeJ2Kto
                                ptrSBody = jsBody;\r
 #ifdef CHECK_THRESHOLDS \r
                                if (image->comps[0].sgnd) {\r
-                                       min_value = 0;\r
-                                       max_value = 65535;\r
-                               } else {\r
                                        min_value = -32768;\r
                                        max_value = 32767;\r
+                               } else {\r
+                                       min_value = 0;\r
+                                       max_value = 65535;\r
                                }\r
                                printf("C: minValue = %d, maxValue = %d\n", min_value, max_value);\r
 #endif                         \r