diff options
| author | Robin Watts <robin.watts@artifex.com> | 2013-10-16 15:03:14 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-11-28 00:41:08 +0000 |
| commit | 81a97d655e373d7371e70f6a2051a41f606c62dc (patch) | |
| tree | 49b636c7a8b30e1817f8d353a139e1fd18303a5b /platform/android | |
| parent | 9c910781c2dd9b7b49fedefc9f140d0c3b1a3896 (diff) | |
| download | mupdf-81a97d655e373d7371e70f6a2051a41f606c62dc.tar.xz | |
Update mupdf to use latest openjpeg pulled from ghostpdl.
The OpenJPEG in gs is v2, with various patches for fixes. These are in
the process of being passed upstream. We now automatically pull the
openjpeg tree out of GhostPDL and put it in as one particular branch
in the thirdparty/openjpeg.git repo. Change to track this in MuPDF.
This is in keeping with what we have been doing with the jbig2dec
repo for a while now.
Diffstat (limited to 'platform/android')
| -rw-r--r-- | platform/android/jni/Core.mk | 2 | ||||
| -rw-r--r-- | platform/android/jni/ThirdParty.mk | 52 |
2 files changed, 27 insertions, 27 deletions
diff --git a/platform/android/jni/Core.mk b/platform/android/jni/Core.mk index 6432843e..26d5a629 100644 --- a/platform/android/jni/Core.mk +++ b/platform/android/jni/Core.mk @@ -22,7 +22,7 @@ endif LOCAL_C_INCLUDES := \ ../../thirdparty/jbig2dec \ - ../../thirdparty/openjpeg/src/lib/openjp2 \ + ../../thirdparty/openjpeg/libopenjpeg \ ../../thirdparty/jpeg \ ../../thirdparty/zlib \ ../../thirdparty/freetype/include \ diff --git a/platform/android/jni/ThirdParty.mk b/platform/android/jni/ThirdParty.mk index e4cd3d67..0092a438 100644 --- a/platform/android/jni/ThirdParty.mk +++ b/platform/android/jni/ThirdParty.mk @@ -6,7 +6,7 @@ MY_ROOT := ../.. LOCAL_C_INCLUDES := \ ../../thirdparty/jbig2dec \ - ../../thirdparty/openjpeg/src/lib/openjp2 \ + ../../thirdparty/openjpeg/libopenjpeg \ ../../thirdparty/jpeg \ ../../thirdparty/zlib \ ../../thirdparty/freetype/include \ @@ -41,31 +41,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/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/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/jpeg/jaricom.c \ $(MY_ROOT)/thirdparty/jpeg/jcomapi.c \ $(MY_ROOT)/thirdparty/jpeg/jdapimin.c \ |