diff options
| author | Tugdil Goldhand | 2017-05-30 19:12:48 +0200 |
|---|---|---|
| committer | Tugdil Goldhand | 2017-05-30 19:12:48 +0200 |
| commit | 208bfdd14397fca7e554bf8e0c3c648202f452b6 (patch) | |
| tree | 9f9184385ae010f382e60d23b369ce56a6b325f2 /0001-mupdf-openjpeg.patch | |
| parent | f3fd8f69696cbf9507e0248f1863967e048fad2e (diff) | |
| download | aur-mupdf-nojs.tar.gz | |
Sync with Arch upstream to 1.11
Diffstat (limited to '0001-mupdf-openjpeg.patch')
| -rw-r--r-- | 0001-mupdf-openjpeg.patch | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/0001-mupdf-openjpeg.patch b/0001-mupdf-openjpeg.patch index b41e3477907e..3172ab07783f 100644 --- a/0001-mupdf-openjpeg.patch +++ b/0001-mupdf-openjpeg.patch @@ -1,31 +1,35 @@ ---- a/source/fitz/load-jpx.c +diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c +index d01de58..6ca3838 100644 +--- a/source/fitz/load-jpx.c +++ b/source/fitz/load-jpx.c -@@ -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. */ -+ +@@ -444,14 +444,18 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int + + #else /* HAVE_LURATECH */ + +#ifdef __cplusplus +extern "C" +{ #define OPJ_STATIC - #ifndef _MSC_VER + #define OPJ_HAVE_INTTYPES_H + #if !defined(_WIN32) && !defined(_WIN64) #define OPJ_HAVE_STDINT_H #endif +#endif + #define USE_JPIP -#include <openjpeg.h> -- +#include <openjpeg-2.1/openjpeg.h> -+ - /* 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 @@ + + struct fz_jpxd_s + { +@@ -919,6 +923,10 @@ fz_load_jpx_info(fz_context *ctx, unsigned char *data, size_t size, int *wp, int + *yresp = state.yres; } - #endif /* HAVE_LURATECH */ -+ -+#ifdef __cplusplus -+} ++#ifdef __cplusplus ++} +#endif ++ + #endif /* HAVE_LURATECH */ + + #else /* FZ_ENABLE_JPX */ |