From f88bfe2e62dbadb96d4f52d7aa025f0a516078da Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Wed, 13 Apr 2016 02:38:18 +0200 Subject: thirdparty: Update to openjpeg 2.1.0. --- Makethird | 5 +- platform/android/viewer/jni/Core.mk | 3 +- platform/android/viewer/jni/ThirdParty.mk | 55 ++++++------ platform/win32/libmupdf.vcproj | 20 ++--- platform/win32/libthirdparty.vcproj | 142 ++++++++++++++---------------- scripts/openjpeg/opj_config.h | 21 ----- scripts/openjpeg/opj_config_private.h | 48 ---------- source/fitz/load-jpx.c | 2 +- thirdparty/openjpeg | 2 +- 9 files changed, 106 insertions(+), 192 deletions(-) delete mode 100644 scripts/openjpeg/opj_config.h delete mode 100644 scripts/openjpeg/opj_config_private.h diff --git a/Makethird b/Makethird index 464133fd..3a40fcb6 100644 --- a/Makethird +++ b/Makethird @@ -11,7 +11,7 @@ HARFBUZZ_DIR := thirdparty/harfbuzz JBIG2DEC_DIR := thirdparty/jbig2dec JPEG_DIR := thirdparty/jpeg MUJS_DIR := thirdparty/mujs -OPENJPEG_DIR := thirdparty/openjpeg/libopenjpeg +OPENJPEG_DIR := thirdparty/openjpeg/src/lib/openjp2 ZLIB_DIR := thirdparty/zlib CURL_DIR := thirdparty/curl @@ -273,7 +273,6 @@ OPENJPEG_SRC := \ mct.c \ mqc.c \ openjpeg.c \ - opj_clock.c \ phix_manager.c \ pi.c \ ppix_manager.c \ @@ -292,7 +291,7 @@ $(OPENJPEG_OUT): $(OPENJPEG_OUT)/%.o: $(OPENJPEG_DIR)/%.c | $(OPENJPEG_OUT) $(CC_CMD) -DOPJ_STATIC -DOPJ_HAVE_STDINT_H -OPENJPEG_CFLAGS += -Iscripts/openjpeg -I$(OPENJPEG_DIR) +OPENJPEG_CFLAGS += -I$(OPENJPEG_DIR) -DOPJ_HAVE_INTTYPES_H=1 -DUSE_JPIP=1 else OPENJPEG_CFLAGS := $(SYS_OPENJPEG_CFLAGS) OPENJPEG_LIBS := $(SYS_OPENJPEG_LIBS) diff --git a/platform/android/viewer/jni/Core.mk b/platform/android/viewer/jni/Core.mk index 76241841..131e6535 100644 --- a/platform/android/viewer/jni/Core.mk +++ b/platform/android/viewer/jni/Core.mk @@ -33,7 +33,7 @@ endif LOCAL_C_INCLUDES := \ $(MY_ROOT)/thirdparty/harfbuzz/src \ $(MY_ROOT)/thirdparty/jbig2dec \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2 \ $(MY_ROOT)/thirdparty/jpeg \ $(MY_ROOT)/thirdparty/mujs \ $(MY_ROOT)/thirdparty/zlib \ @@ -46,7 +46,6 @@ LOCAL_C_INCLUDES := \ $(MY_ROOT)/source/tiff \ $(MY_ROOT)/scripts/freetype \ $(MY_ROOT)/scripts/jpeg \ - $(MY_ROOT)/scripts/openjpeg \ $(MY_ROOT)/generated \ $(MY_ROOT)/resources \ $(MY_ROOT)/include \ diff --git a/platform/android/viewer/jni/ThirdParty.mk b/platform/android/viewer/jni/ThirdParty.mk index f8965ed9..8ea3fe8d 100644 --- a/platform/android/viewer/jni/ThirdParty.mk +++ b/platform/android/viewer/jni/ThirdParty.mk @@ -8,18 +8,17 @@ LOCAL_C_INCLUDES := \ $(MY_ROOT)/include/ \ $(MY_ROOT)/thirdparty/harfbuzz/src \ $(MY_ROOT)/thirdparty/jbig2dec \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2 \ $(MY_ROOT)/thirdparty/jpeg \ $(MY_ROOT)/thirdparty/mujs \ $(MY_ROOT)/thirdparty/zlib \ $(MY_ROOT)/thirdparty/freetype/include \ $(MY_ROOT)/scripts/freetype \ - $(MY_ROOT)/scripts/jpeg \ - $(MY_ROOT)/scripts/openjpeg + $(MY_ROOT)/scripts/jpeg LOCAL_CFLAGS := \ -DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON -DHAVE_STDINT_H \ - -DOPJ_HAVE_STDINT_H \ + -DOPJ_HAVE_STDINT_H -DOPJ_HAVE_INTTYPES_H -DUSE_JPIP \ '-DFT_CONFIG_MODULES_H="slimftmodules.h"' \ '-DFT_CONFIG_OPTIONS_H="slimftoptions.h"' \ -Dhb_malloc_impl=hb_malloc -Dhb_calloc_impl=hb_calloc \ @@ -85,31 +84,29 @@ LOCAL_SRC_FILES := \ $(MY_ROOT)/thirdparty/jbig2dec/jbig2_segment.c \ $(MY_ROOT)/thirdparty/jbig2dec/jbig2_symbol_dict.c \ $(MY_ROOT)/thirdparty/jbig2dec/jbig2_text.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/bio.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/cidx_manager.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/cio.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/dwt.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/event.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/function_list.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/image.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/invert.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/j2k.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/jp2.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/mct.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/mqc.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/openjpeg.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/opj_clock.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/phix_manager.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/pi.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/ppix_manager.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/raw.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/t1.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/t1_generate_luts.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/t2.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/tcd.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/tgt.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/thix_manager.c \ - $(MY_ROOT)/thirdparty/openjpeg/libopenjpeg/tpix_manager.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/bio.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/cidx_manager.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/cio.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/dwt.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/event.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/function_list.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/image.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/invert.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/j2k.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/jp2.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/mct.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/mqc.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/openjpeg.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/phix_manager.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/pi.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/ppix_manager.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/raw.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/t1.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/t2.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/tcd.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/tgt.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/thix_manager.c \ + $(MY_ROOT)/thirdparty/openjpeg/src/lib/openjp2/tpix_manager.c \ $(MY_ROOT)/thirdparty/jpeg/jaricom.c \ $(MY_ROOT)/thirdparty/jpeg/jcomapi.c \ $(MY_ROOT)/thirdparty/jpeg/jdapimin.c \ diff --git a/platform/win32/libmupdf.vcproj b/platform/win32/libmupdf.vcproj index a760821d..8da9633d 100644 --- a/platform/win32/libmupdf.vcproj +++ b/platform/win32/libmupdf.vcproj @@ -43,7 +43,7 @@ - - - - - - diff --git a/scripts/openjpeg/opj_config.h b/scripts/openjpeg/opj_config.h deleted file mode 100644 index bd0babed..00000000 --- a/scripts/openjpeg/opj_config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* If you want to build the library manually without using - * 'configure' or 'CMake' - * then copy this file - * 'opj_config.h.cmake.in' - * to - * 'opj_config.h' - * - * Open 'opj_config.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.h' will be included in some source files. - * ==== YOU CAN NOT COMPILE WITHOUT IT. ==== - * === DO NOT FORGET TO CHANGE 'config.nix' APPROPRIATELY. ==== -*/ -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -#define OPJ_BIG_ENDIAN 1 -#endif diff --git a/scripts/openjpeg/opj_config_private.h b/scripts/openjpeg/opj_config_private.h deleted file mode 100644 index 70f1f6d8..00000000 --- a/scripts/openjpeg/opj_config_private.h +++ /dev/null @@ -1,48 +0,0 @@ -/* 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/source/fitz/load-jpx.c b/source/fitz/load-jpx.c index 6b92e5c8..7327a6bf 100644 --- a/source/fitz/load-jpx.c +++ b/source/fitz/load-jpx.c @@ -117,7 +117,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs opj_stream_set_read_function(stream, fz_opj_stream_read); opj_stream_set_skip_function(stream, fz_opj_stream_skip); opj_stream_set_seek_function(stream, fz_opj_stream_seek); - opj_stream_set_user_data(stream, &sb); + opj_stream_set_user_data(stream, &sb, NULL); /* Set the length to avoid an assert */ opj_stream_set_user_data_length(stream, size); diff --git a/thirdparty/openjpeg b/thirdparty/openjpeg index 4c7d23d2..731b9d0b 160000 --- a/thirdparty/openjpeg +++ b/thirdparty/openjpeg @@ -1 +1 @@ -Subproject commit 4c7d23d2cd00cee7822a61d1e8472439bd6d53c9 +Subproject commit 731b9d0b35ce1d913620387eab8d6e294afac697 -- cgit v1.2.3