diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-05-02 12:22:21 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2017-05-02 12:22:21 +0000 |
| commit | fb788017cd8925a764a0a085f3bc0ef0d455e390 (patch) | |
| tree | 0b0dbccf2d6bbac14a450789e20337f9cd5bfbf6 /graphics/mupdf/files/patch-source__fitz__load-jpx.c | |
| parent | Update to 1.1 (diff) | |
Update to 1.11
- Prevent linking with libcrypto when a pkg-config file for it exists
on the system [1]
- Bump PORTREVISION of dependent ports
PR: 218996, 218688 [1]
Reported by: rsmith@xs4all.nl [1]
Submitted by: Zsolt Udvari <udvzsolt@gmail.com> (maintainer)
Approved by: lme (mentor)
Differential Revision: https://reviews.freebsd.org/D10561
Diffstat (limited to 'graphics/mupdf/files/patch-source__fitz__load-jpx.c')
| -rw-r--r-- | graphics/mupdf/files/patch-source__fitz__load-jpx.c | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/graphics/mupdf/files/patch-source__fitz__load-jpx.c b/graphics/mupdf/files/patch-source__fitz__load-jpx.c index ef42f75f4922..34fe65d83ebc 100644 --- a/graphics/mupdf/files/patch-source__fitz__load-jpx.c +++ b/graphics/mupdf/files/patch-source__fitz__load-jpx.c @@ -1,19 +1,33 @@ ---- source/fitz/load-jpx.c.orig 2016-11-28 13:34:04 UTC +--- source/fitz/load-jpx.c.orig 2017-04-05 11:02:21 UTC +++ source/fitz/load-jpx.c -@@ -481,15 +481,7 @@ fz_load_jpx_info(fz_context *ctx, unsign +@@ -444,14 +444,18 @@ fz_load_jpx_info(fz_context *ctx, unsign #else /* HAVE_LURATECH */ --/* 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 -- ++#ifdef __cplusplus ++extern "C" ++{ + #define OPJ_STATIC + #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 + struct fz_jpxd_s + { +@@ -919,6 +923,10 @@ fz_load_jpx_info(fz_context *ctx, unsign + *yresp = state.yres; + } + ++#ifdef __cplusplus ++} ++#endif ++ + #endif /* HAVE_LURATECH */ + + #else /* FZ_ENABLE_JPX */ |