diff options
| author | Shailesh Mistry <shailesh.mistry@hotmail.co.uk> | 2013-05-18 00:02:00 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2013-05-24 18:13:15 +0100 |
| commit | a1c8ba17f74180c5e05c4eb7b67912d14ea7b080 (patch) | |
| tree | 3cd022e899d05cf9cd49a9f920a88a3d95ec30ae /fitz/image_jpx.c | |
| parent | 6a3d99b2a38e304a32059066b6c4026b746d935c (diff) | |
| download | mupdf-a1c8ba17f74180c5e05c4eb7b67912d14ea7b080.tar.xz | |
Update build to use the latest openJPEG2
Diffstat (limited to 'fitz/image_jpx.c')
| -rw-r--r-- | fitz/image_jpx.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fitz/image_jpx.c b/fitz/image_jpx.c index f8e6d8c0..44081f6c 100644 --- a/fitz/image_jpx.c +++ b/fitz/image_jpx.c @@ -1,6 +1,13 @@ #include "fitz-internal.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 _WIN32 +#define OPJ_HAVE_STDINT_H +#endif + #include <openjpeg.h> static void fz_opj_error_callback(const char *msg, void *client_data) @@ -75,7 +82,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs opj_stream_t *stream; fz_colorspace *colorspace; unsigned char *p; - int format; + OPJ_CODEC_FORMAT format; int a, n, w, h, depth, sgnd; int x, y, k, v; stream_block sb; |