(thanks to Winfried for his help)

[openjpeg.git] / JavaOpenJPEG / JavaOpenJPEGDecoder.c

diff --git a/JavaOpenJPEG/JavaOpenJPEGDecoder.c b/JavaOpenJPEG/JavaOpenJPEGDecoder.c
index 3f65655abf196dae9d4f90d535f8447062cb7d1b..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