diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2015-10-10 02:33:09 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2015-10-10 02:33:09 +0800 |
| commit | 9f1083ef2d6d89717245507e887b749de5d81c7a (patch) | |
| tree | 033118a2dde54fdc75bfc804d52623026b576161 /graphics | |
| parent | ae0f83721466109da519cd860c52231528930306 (diff) | |
| download | freebsd-ports-gnome-9f1083ef2d6d89717245507e887b749de5d81c7a.tar.gz freebsd-ports-gnome-9f1083ef2d6d89717245507e887b749de5d81c7a.tar.zst freebsd-ports-gnome-9f1083ef2d6d89717245507e887b749de5d81c7a.zip | |
- Fix patch
PR: 203327
Submitted by: Wolfgang Jenkner <wjenkner@inode.at>
Approved by: Zsolt Udvari <udvzsolt@gmail.com> (maintainer, implicit)
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/mupdf/files/patch-source__fitz__load-jpx.c | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/graphics/mupdf/files/patch-source__fitz__load-jpx.c b/graphics/mupdf/files/patch-source__fitz__load-jpx.c index 3f28b2908099..3d62514d7936 100644 --- a/graphics/mupdf/files/patch-source__fitz__load-jpx.c +++ b/graphics/mupdf/files/patch-source__fitz__load-jpx.c @@ -1,25 +1,22 @@ --- source/fitz/load-jpx.c.orig 2015-04-16 08:57:45 UTC +++ 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 +@@ -1,14 +1,6 @@ + #include "mupdf/fitz.h" +-/* 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. */ +-#define OPJ_STATIC +-#ifndef _MSC_VER +-#define OPJ_HAVE_STDINT_H +-#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 +@@ -117,7 +109,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); @@ -28,10 +25,3 @@ /* 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 |