From d08a96e2517c545b8ff2d7b89c7778eb5b1fd4ba Mon Sep 17 00:00:00 2001 From: Antonin Descampe Date: Wed, 8 Dec 2010 11:06:41 +0000 Subject: (thanks to Winfried for his help) * [antonin] changed remaining "WIN32" to "_WIN32" ! [antonin] libopenjpeg has no more dependency on LCMS lib. Everything concerning color (icc profile, conversion to rgb, etc) has been put outside libopenjpeg and is used in j2k_to_image.c and mj2_to_frames.c. - [antonin] removed "opj_convert{.c,.h}" + [antonin] added a directory "common/" that contains "getopt{.c,.h}" (previously in "codec/compat"). + [antonin] added files "color{.c,.h}" in "common/" that define the code for icc profile management and sycc_to_rgb conversion + [antonin] added "common/format_defs.h" that contains common definitions used in image_to_j2k, j2k_to_image, j2k_dump. --- JavaOpenJPEG/JavaOpenJPEGDecoder.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'JavaOpenJPEG/JavaOpenJPEGDecoder.c') 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 #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; -- cgit v1.2.3