diff options
author | tugdilgoldhand | 2016-09-04 11:01:21 +0200 |
---|---|---|
committer | tugdilgoldhand | 2016-09-04 11:01:21 +0200 |
commit | 96ad9ad56666984bda928ea3fccad897fb49d979 (patch) | |
tree | 42a13fe89bd70dc6679b8afa6a3de00d49fc4d92 /0001-mupdf-openjpeg.patch | |
parent | c93566e0862f0d8a5b8739636cb1546169c9e249 (diff) | |
download | aur-96ad9ad56666984bda928ea3fccad897fb49d979.tar.gz |
Update to 1.9a
Diffstat (limited to '0001-mupdf-openjpeg.patch')
-rw-r--r-- | 0001-mupdf-openjpeg.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/0001-mupdf-openjpeg.patch b/0001-mupdf-openjpeg.patch new file mode 100644 index 000000000000..562b7488052d --- /dev/null +++ b/0001-mupdf-openjpeg.patch @@ -0,0 +1,38 @@ +--- a/source/fitz/load-jpx.c ++++ b/source/fitz/load-jpx.c +@@ -3,12 +3,17 @@ + /* 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. */ ++ ++#ifdef __cplusplus ++extern "C" ++{ + #define OPJ_STATIC + #ifndef _MSC_VER + #define OPJ_HAVE_STDINT_H + #endif ++#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; + } ++#ifdef __cplusplus ++} ++#endif + |