diff options
| author | tugdilgoldhand | 2016-12-12 21:08:06 +0100 |
|---|---|---|
| committer | tugdilgoldhand | 2016-12-12 21:08:06 +0100 |
| commit | f3fd8f69696cbf9507e0248f1863967e048fad2e (patch) | |
| tree | 3137f4169601af6a5858c267bd7f1b977462443c /0001-mupdf-openjpeg.patch | |
| parent | 6a726cdaf8663f49e1d570209ff54de1f55af481 (diff) | |
| download | aur-f3fd8f69696cbf9507e0248f1863967e048fad2e.tar.gz | |
update to 1.10a
Diffstat (limited to '0001-mupdf-openjpeg.patch')
| -rw-r--r-- | 0001-mupdf-openjpeg.patch | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/0001-mupdf-openjpeg.patch b/0001-mupdf-openjpeg.patch index 562b7488052d..b41e3477907e 100644 --- a/0001-mupdf-openjpeg.patch +++ b/0001-mupdf-openjpeg.patch @@ -1,6 +1,6 @@ ---- a/source/fitz/load-jpx.c +--- a/source/fitz/load-jpx.c +++ b/source/fitz/load-jpx.c -@@ -3,12 +3,17 @@ +@@ -484,13 +484,18 @@ /* Without the definition of OPJ_STATIC, compilation fails on windows * due to the use of __stdcall. We believe it is required on some * linux toolchains too. */ @@ -15,24 +15,17 @@ +#endif -#include <openjpeg.h> +- +#include <openjpeg-2.1/openjpeg.h> - - static void fz_opj_error_callback(const char *msg, void *client_data) - { -@@ -117,7 +122,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); - -@@ -247,3 +252,6 @@ fz_load_jpx(fz_context *ctx, unsigned ch - - return img; ++ + /* OpenJPEG does not provide a safe mechanism to intercept + * allocations. In the latest version all allocations go + * though opj_malloc etc, but no context is passed around. +@@ -972,3 +977,7 @@ } -+#ifdef __cplusplus -+} + + #endif /* HAVE_LURATECH */ ++ ++#ifdef __cplusplus ++} +#endif - |