mupdf/mupdf-fix-openjpeg2.patch

29 lines
1.3 KiB
Diff
Raw Normal View History

Index: mupdf-1.4-source/Makerules
2014-01-06 04:43:18 +01:00
===================================================================
--- mupdf-1.4-source.orig/Makerules
+++ mupdf-1.4-source/Makerules
@@ -71,8 +71,8 @@ SYS_X11_LIBS = $(shell pkg-config --libs
2014-01-06 04:43:18 +01:00
SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
-SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1)
+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjp2)
+SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjp2)
2014-01-06 04:43:18 +01:00
SYS_JBIG2DEC_LIBS = -ljbig2dec
SYS_JPEG_LIBS = -ljpeg
SYS_ZLIB_LIBS = -lz
Index: mupdf-1.4-source/source/fitz/load-jpx.c
===================================================================
--- mupdf-1.4-source.orig/source/fitz/load-jpx.c
+++ mupdf-1.4-source/source/fitz/load-jpx.c
@@ -117,7 +117,7 @@ fz_load_jpx(fz_context *ctx, unsigned ch
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);