diff options
| author | Sebastian Rasmussen <sebras@gmail.com> | 2018-08-01 17:49:02 +0800 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@gmail.com> | 2018-08-01 17:52:07 +0800 |
| commit | 43a0278d42ac1b350ce6b582f9d0e3d7785a17b6 (patch) | |
| tree | 41059a933f9e4364b3decb8396d9be1300e15a03 | |
| parent | 709b4b95e1b30a62511234773fb53f75a40279f3 (diff) | |
| download | mupdf-43a0278d42ac1b350ce6b582f9d0e3d7785a17b6.tar.xz | |
Update jbig2dec.
| -rw-r--r-- | Makethird | 1 | ||||
| -rw-r--r-- | platform/java/Android.mk | 1 | ||||
| -rw-r--r-- | platform/win32/libthirdparty.vcproj | 4 | ||||
| -rw-r--r-- | source/fitz/filter-jbig2.c | 3 | ||||
| m--------- | thirdparty/jbig2dec | 0 |
5 files changed, 1 insertions, 8 deletions
@@ -283,7 +283,6 @@ THIRD_SRC += thirdparty/jbig2dec/jbig2_generic.c THIRD_SRC += thirdparty/jbig2dec/jbig2_halftone.c THIRD_SRC += thirdparty/jbig2dec/jbig2_huffman.c THIRD_SRC += thirdparty/jbig2dec/jbig2_image.c -THIRD_SRC += thirdparty/jbig2dec/jbig2_metadata.c THIRD_SRC += thirdparty/jbig2dec/jbig2_mmr.c THIRD_SRC += thirdparty/jbig2dec/jbig2_page.c THIRD_SRC += thirdparty/jbig2dec/jbig2_refinement.c diff --git a/platform/java/Android.mk b/platform/java/Android.mk index d29c07da..d91c9353 100644 --- a/platform/java/Android.mk +++ b/platform/java/Android.mk @@ -189,7 +189,6 @@ LOCAL_SRC_FILES += \ $(MUPDF_PATH)/thirdparty/jbig2dec/jbig2_halftone.c \ $(MUPDF_PATH)/thirdparty/jbig2dec/jbig2_huffman.c \ $(MUPDF_PATH)/thirdparty/jbig2dec/jbig2_image.c \ - $(MUPDF_PATH)/thirdparty/jbig2dec/jbig2_metadata.c \ $(MUPDF_PATH)/thirdparty/jbig2dec/jbig2_mmr.c \ $(MUPDF_PATH)/thirdparty/jbig2dec/jbig2_page.c \ $(MUPDF_PATH)/thirdparty/jbig2dec/jbig2_refinement.c \ diff --git a/platform/win32/libthirdparty.vcproj b/platform/win32/libthirdparty.vcproj index ffd39dbc..0d15478d 100644 --- a/platform/win32/libthirdparty.vcproj +++ b/platform/win32/libthirdparty.vcproj @@ -804,10 +804,6 @@ > </File> <File - RelativePath="..\..\thirdparty\jbig2dec\jbig2_metadata.c" - > - </File> - <File RelativePath="..\..\thirdparty\jbig2dec\jbig2_mmr.c" > </File> diff --git a/source/fitz/filter-jbig2.c b/source/fitz/filter-jbig2.c index 599f94c0..e984b6cf 100644 --- a/source/fitz/filter-jbig2.c +++ b/source/fitz/filter-jbig2.c @@ -346,7 +346,7 @@ next_jbig2d(fz_context *ctx, fz_stream *stm, size_t len) return *stm->rp++; } -static int +static void error_callback(void *data, const char *msg, Jbig2Severity severity, int32_t seg_idx) { fz_context *ctx = data; @@ -354,7 +354,6 @@ error_callback(void *data, const char *msg, Jbig2Severity severity, int32_t seg_ fz_warn(ctx, "jbig2dec error: %s (segment %d)", msg, seg_idx); else if (severity == JBIG2_SEVERITY_WARNING) fz_warn(ctx, "jbig2dec warning: %s (segment %d)", msg, seg_idx); - return 0; } static void *fz_jbig2_alloc(Jbig2Allocator *allocator, size_t size) diff --git a/thirdparty/jbig2dec b/thirdparty/jbig2dec -Subproject 58e7c65dfc9ccce4f01a0e49d12d9d1c060a119 +Subproject 06ddc496c3ea047ccb440e42adec7580317ff06 |