diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-05-27 12:53:42 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-05-27 15:18:59 +0100 |
| commit | 22cde5d847d90fc9efc86c8862435b751c51430d (patch) | |
| tree | 4ada92581816803c60cbda57a9a5ad46b5429a1d | |
| parent | 4fc3c0324e080c3df7455a9ba8fcb60d6baba7eb (diff) | |
| download | mupdf-22cde5d847d90fc9efc86c8862435b751c51430d.tar.xz | |
Pull in latest fixes to jbig2dec.
Also fix android building with latest openjpeg2.
| -rw-r--r-- | android/jni/Core.mk | 2 | ||||
| -rw-r--r-- | android/jni/Core2.mk | 2 | ||||
| -rw-r--r-- | android/jni/ThirdParty.mk | 51 | ||||
| m--------- | thirdparty/jbig2dec | 0 |
4 files changed, 29 insertions, 26 deletions
diff --git a/android/jni/Core.mk b/android/jni/Core.mk index 9fa6d060..8e7bb16a 100644 --- a/android/jni/Core.mk +++ b/android/jni/Core.mk @@ -23,7 +23,7 @@ endif LOCAL_C_INCLUDES := \ ../thirdparty/jbig2dec \ - ../thirdparty/$(OPENJPEG)/libopenjpeg \ + ../thirdparty/$(OPENJPEG)/src/lib/openjp2 \ ../thirdparty/$(JPEG) \ ../thirdparty/$(ZLIB) \ ../thirdparty/$(FREETYPE)/include \ diff --git a/android/jni/Core2.mk b/android/jni/Core2.mk index 9a7c0de9..d73ebaf2 100644 --- a/android/jni/Core2.mk +++ b/android/jni/Core2.mk @@ -24,7 +24,7 @@ endif LOCAL_C_INCLUDES := \ ../thirdparty/jbig2dec \ - ../thirdparty/$(OPENJPEG)/libopenjpeg \ + ../thirdparty/$(OPENJPEG)/src/lib/openjp2 \ ../thirdparty/$(JPEG) \ ../thirdparty/$(ZLIB) \ ../thirdparty/$(FREETYPE)/include \ diff --git a/android/jni/ThirdParty.mk b/android/jni/ThirdParty.mk index e92ca2c4..a1a89be7 100644 --- a/android/jni/ThirdParty.mk +++ b/android/jni/ThirdParty.mk @@ -11,7 +11,7 @@ FREETYPE := freetype LOCAL_C_INCLUDES := \ ../thirdparty/jbig2dec \ - ../thirdparty/$(OPENJPEG)/libopenjpeg \ + ../thirdparty/$(OPENJPEG)/src/lib/openjp2 \ ../thirdparty/$(JPEG) \ ../thirdparty/$(ZLIB) \ ../thirdparty/$(FREETYPE)/include \ @@ -19,6 +19,7 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON -DHAVE_STDINT_H \ + -DOPJ_HAVE_STDINT_H \ '-DFT_CONFIG_MODULES_H="slimftmodules.h"' \ '-DFT_CONFIG_OPTIONS_H="slimftoptions.h"' ifdef NDK_PROFILER @@ -45,29 +46,31 @@ 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/image.c \ - $(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/j2k.c \ - $(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/j2k_lib.c \ - $(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/jp2.c \ - $(MY_ROOT)/thirdparty/$(OPENJPEG)/libopenjpeg/jpt.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/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/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/opj_clock.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/t1_generate_luts.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/thirdparty/jbig2dec b/thirdparty/jbig2dec -Subproject 3e6c1b0670740be3b138228dcc134bf5e6c1ece +Subproject d02b3649334e59e862b37c70d7d0fa9e086a524 |