diff options
| -rw-r--r-- | Makethird | 4 | ||||
| -rw-r--r-- | fitz/image_jpx.c | 9 | ||||
| -rw-r--r-- | scripts/opj_config.h | 26 | ||||
| -rw-r--r-- | scripts/opj_config_private.h | 48 | ||||
| m--------- | thirdparty/openjpeg | 0 |
5 files changed, 59 insertions, 28 deletions
@@ -186,7 +186,7 @@ endif # --- OpenJPEG --- ifneq "$(wildcard $(OPENJPEG_DIR)/README)" "" -CFLAGS += -I$(OPENJPEG_DIR)/src/lib/openjp2 -DOPJ_STATIC -DOPJ_HAVE_STDINT_H -DHAVE_SSIZE_T -DHAVE_INTTYPES_H +CFLAGS += -I$(OPENJPEG_DIR)/src/lib/openjp2 LIBS := $(filter-out -lopenjpeg, $(LIBS)) OPENJPEG_LIB := $(OUT)/libopenjpeg.a @@ -218,7 +218,7 @@ OPENJPEG_SRC := \ $(OPENJPEG_LIB): $(addprefix $(OUT)/opj_, $(OPENJPEG_SRC:%.c=%.o)) $(OUT)/opj_%.o: $(OPENJPEG_DIR)/src/lib/openjp2/%.c | $(OUT) - $(CC_CMD) + $(CC_CMD) -DOPJ_STATIC -DOPJ_HAVE_STDINT_H else SYS_OPENJPEG_CFLAGS := $(SYS_OPENJPEG_CFLAGS) CFLAGS += $(SYS_OPENJPEG_CFLAGS) diff --git a/fitz/image_jpx.c b/fitz/image_jpx.c index f8e6d8c0..44081f6c 100644 --- a/fitz/image_jpx.c +++ b/fitz/image_jpx.c @@ -1,6 +1,13 @@ #include "fitz-internal.h" +/* Without the definition of OPJ_STATIC, compilation fails on windows + * due to the use of __stdcall. We believe it is required on some + * linux toolchains too. */ #define OPJ_STATIC +#ifndef _WIN32 +#define OPJ_HAVE_STDINT_H +#endif + #include <openjpeg.h> static void fz_opj_error_callback(const char *msg, void *client_data) @@ -75,7 +82,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs opj_stream_t *stream; fz_colorspace *colorspace; unsigned char *p; - int format; + OPJ_CODEC_FORMAT format; int a, n, w, h, depth, sgnd; int x, y, k, v; stream_block sb; diff --git a/scripts/opj_config.h b/scripts/opj_config.h index 39b38228..8ed0857f 100644 --- a/scripts/opj_config.h +++ b/scripts/opj_config.h @@ -1,7 +1,7 @@ /* If you want to build the library manually without using * 'configure' or 'CMake' * then copy this file - * 'opj_config.h.in.user' + * 'opj_config.h.cmake.in' * to * 'opj_config.h' * @@ -17,29 +17,5 @@ * === DO NOT FORGET TO CHANGE 'config.nix' APPROPRIATELY. ==== */ -#define USE_JPIP -#define USE JPWL -#define OPJ_PACKAGE_VERSION "2.0.0" -/* DO NOT DEFINE BOTH VERSIONS OF LCMS */ -/* define to 1 if you have both liblcms and lcms.h installed */ -#undef HAVE_LIBLCMS1 -/* #define HAVE_LIBLCMS1 1 */ -/* define to 1 if you have both liblcms2 and lcms2.h installed */ -#undef HAVE_LIBLCMS2 -/* #define HAVE_LIBLCMS2 1 */ - -/* define to 1 if you have both libpng and png.h installed */ -#undef HAVE_LIBPNG -/* #define HAVE_LIBPNG 1 */ - -/* define to 1 if you have both libtiff and tiff.h installed */ -#undef HAVE_LIBTIFF -/* #define HAVE_LIBTIFF 1 */ - -/*---------------- DO NOT CHANGE BELOW THIS LINE ----------------*/ -#define PACKAGE_URL "http://www.openjpeg.org/" -#define PACKAGE_BUGREPORT "http://code.google.com/p/openjpeg/" - -#define PACKAGE_VERSION "1.4.0" diff --git a/scripts/opj_config_private.h b/scripts/opj_config_private.h new file mode 100644 index 00000000..70f1f6d8 --- /dev/null +++ b/scripts/opj_config_private.h @@ -0,0 +1,48 @@ +/* If you want to build the library manually without using + * 'configure' or 'CMake' + * then copy this file + * 'opj_config_private.h.cmake.in' + * to + * 'opj_config_private.h' + * + * Open 'opj_config_private.h' and change the file contents + * if you want to define something because you know you have + * BOTH installed the library AND the header file(s). + * Then e.g. write +#define HAVE_LIBPNG 1 + * + * + * The file 'opj_config_private.h' will be included in some source files. + * ==== YOU CAN NOT COMPILE WITHOUT IT. ==== + * === DO NOT FORGET TO CHANGE 'config.nix' APPROPRIATELY. ==== +*/ + +#ifndef _WIN32 +#define OPJ_HAVE_INTTYPES_H 1 +#else +#undef OPJ_HAVE_INTTYPES_H +#endif + +#define USE_JPIP +#define OPJ_PACKAGE_VERSION "2.0.0" + +/* DO NOT DEFINE BOTH VERSIONS OF LCMS */ +/* define to 1 if you have both liblcms and lcms.h installed */ +#undef OPJ_HAVE_LIBLCMS1 +/* #define OPJ_HAVE_LIBLCMS1 1 */ + +/* define to 1 if you have both liblcms2 and lcms2.h installed */ +#undef OPJ_HAVE_LIBLCMS2 +/* #define OPJ_HAVE_LIBLCMS2 1 */ + +/* define to 1 if you have both libpng and png.h installed */ +#undef OPJ_HAVE_LIBPNG +/* #define OPJ_HAVE_LIBPNG 1 */ + +/* define to 1 if you have both libtiff and tiff.h installed */ +#undef OPJ_HAVE_LIBTIFF +/* #define OPJ_HAVE_LIBTIFF 1 */ + +/*---------------- DO NOT CHANGE BELOW THIS LINE ----------------*/ +#define PACKAGE_URL "http://www.openjpeg.org/" +#define PACKAGE_BUGREPORT "http://code.google.com/p/openjpeg/" diff --git a/thirdparty/openjpeg b/thirdparty/openjpeg -Subproject 60b9e3580baec146a9ba4bdc53bf7184c1d9471 +Subproject 5efe30fbf00c0a301b52084e004e03ed6e8a9b9 |