diff options
Diffstat (limited to 'JavaOpenJPEG')
| -rw-r--r-- | JavaOpenJPEG/JavaOpenJPEG.c | 19 | ||||
| -rw-r--r-- | JavaOpenJPEG/JavaOpenJPEGDecoder.c | 20 |
2 files changed, 6 insertions, 33 deletions
diff --git a/JavaOpenJPEG/JavaOpenJPEG.c b/JavaOpenJPEG/JavaOpenJPEG.c index 6af3a44a..b1f03028 100644 --- a/JavaOpenJPEG/JavaOpenJPEG.c +++ b/JavaOpenJPEG/JavaOpenJPEG.c @@ -37,32 +37,19 @@ #include <math.h>
#include "openjpeg.h"
-#include "compat/getopt.h"
+#include "getopt.h"
#include "convert.h"
#include "index.h"
#include "dirent.h"
#include "org_openJpeg_OpenJPEGJavaEncoder.h"
-#ifndef WIN32
+#ifndef _WIN32
#define stricmp strcasecmp
#define strnicmp strncasecmp
#endif
-/* ----------------------------------------------------------------------- */
+#include "format_defs.h"
-#define J2K_CFMT 0
-#define JP2_CFMT 1
-#define JPT_CFMT 2
-
-#define PXM_DFMT 10
-#define PGX_DFMT 11
-#define BMP_DFMT 12
-#define YUV_DFMT 13
-#define TIF_DFMT 14
-#define RAW_DFMT 15
-#define TGA_DFMT 16
-
-/* ----------------------------------------------------------------------- */
#define CINEMA_24_CS 1302083 /*Codestream length for 24fps*/
#define CINEMA_48_CS 651041 /*Codestream length for 48fps*/
#define COMP_24_CS 1041666 /*Maximum size per color component for 2K & 4K @ 24fps*/
diff --git a/JavaOpenJPEG/JavaOpenJPEGDecoder.c b/JavaOpenJPEG/JavaOpenJPEGDecoder.c index 3f65655a..decc1373 100644 --- a/JavaOpenJPEG/JavaOpenJPEGDecoder.c +++ b/JavaOpenJPEG/JavaOpenJPEGDecoder.c @@ -37,31 +37,17 @@ #include <math.h>
#include "openjpeg.h"
-#include "compat/getopt.h"
+#include "getopt.h"
#include "convert.h"
#include "dirent.h"
#include "org_openJpeg_OpenJPEGJavaDecoder.h"
-#ifndef WIN32
+#ifndef _WIN32
#define stricmp strcasecmp
#define strnicmp strncasecmp
#endif
-/* ----------------------------------------------------------------------- */
-
-#define J2K_CFMT 0
-#define JP2_CFMT 1
-#define JPT_CFMT 2
-
-#define PXM_DFMT 10
-#define PGX_DFMT 11
-#define BMP_DFMT 12
-#define YUV_DFMT 13
-#define TIF_DFMT 14
-#define RAW_DFMT 15
-#define TGA_DFMT 16
-
-/* ----------------------------------------------------------------------- */
+#include "format_defs.h"
typedef struct callback_variables {
JNIEnv *env;
|