You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
698 B
32 lines
698 B
7 years ago
|
diff --git i/source/fitz/load-jpx.c w/source/fitz/load-jpx.c
|
||
|
7 years ago
|
index 65699bab..800ee32c 100644
|
||
|
7 years ago
|
--- i/source/fitz/load-jpx.c
|
||
|
|
+++ w/source/fitz/load-jpx.c
|
||
|
7 years ago
|
@@ -444,12 +444,15 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w
|
||
8 years ago
|
}
|
||
|
|
|
||
|
|
#else /* HAVE_LURATECH */
|
||
|
|
-
|
||
|
|
+#ifdef __cplusplus
|
||
|
|
+extern "C"
|
||
|
|
+{
|
||
|
|
#define OPJ_STATIC
|
||
|
|
#define OPJ_HAVE_INTTYPES_H
|
||
|
7 years ago
|
#if !defined(_MSC_VER) || _MSC_VER >= 1600
|
||
|
8 years ago
|
#define OPJ_HAVE_STDINT_H
|
||
|
|
#endif
|
||
|
|
+#endif
|
||
|
|
#define USE_JPIP
|
||
|
|
|
||
|
7 years ago
|
#include <openjpeg.h>
|
||
|
7 years ago
|
@@ -931,6 +934,9 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w
|
||
|
8 years ago
|
}
|
||
|
|
|
||
|
|
#endif /* HAVE_LURATECH */
|
||
|
|
+#ifdef __cplusplus
|
||
|
|
+}
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#else /* FZ_ENABLE_JPX */
|
||
|
|
|