diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-11-12 21:21:21 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-11-13 09:02:30 +0100 |
| commit | 71cb2705af38df7f382014fb68f43bed98abf9b4 (patch) | |
| tree | 5f52549e5d382cdd858f5cdeaffe6517d59a689e /external | |
| parent | 641d166b8bf0e461198479f489bc50d8b4171b19 (diff) | |
external: update pdfium to 3963
Also simplify visibility.patch.1.
Change-Id: I8b4ed78b314a1a1f7d31467f782877f056429cc2
Reviewed-on: https://gerrit.libreoffice.org/82548
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/pdfium/Library_pdfium.mk | 7 | ||||
| -rw-r--r-- | external/pdfium/visibility.patch.1 | 49 |
2 files changed, 19 insertions, 37 deletions
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index e6750cc822b9..f98a2d11269b 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_set_include,pdfium,\ )) $(eval $(call gb_Library_add_defs,pdfium,\ - -DPDFIUM_DLLIMPLEMENTATION \ + -DFPDF_IMPLEMENTATION \ -DUSE_SYSTEM_LCMS2 \ -DUSE_SYSTEM_LIBJPEG \ -DUSE_SYSTEM_ZLIB \ @@ -241,6 +241,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_textrenderer \ UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_type3cache \ UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_type3glyphmap \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_rendershading \ UnpackedTarball/pdfium/core/fpdfapi/edit/cpdf_creator \ UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_encryptor \ UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_flateencoder \ @@ -635,6 +636,10 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ $(eval $(call gb_Library_use_system_win32_libs,pdfium,\ gdi32 \ )) + +$(eval $(call gb_Library_add_defs,pdfium,\ + -DWIN32 \ +)) endif ifeq ($(OS),MACOSX) diff --git a/external/pdfium/visibility.patch.1 b/external/pdfium/visibility.patch.1 index 9983723b2055..835528794f4b 100644 --- a/external/pdfium/visibility.patch.1 +++ b/external/pdfium/visibility.patch.1 @@ -1,45 +1,22 @@ diff --git a/public/fpdfview.h b/public/fpdfview.h -index f5212599f..57d6cda13 100644 +index 2b84f07ba..b6c0a356b 100644 --- a/public/fpdfview.h +++ b/public/fpdfview.h -@@ -154,31 +154,20 @@ typedef int FPDF_ANNOT_APPEARANCEMODE; - // Dictionary value types. - typedef int FPDF_OBJECT_TYPE; +@@ -168,7 +168,6 @@ typedef int FPDF_OBJECT_TYPE; + // Text object enums. + typedef int FPDF_TEXT_RENDERMODE; -#if defined(COMPONENT_BUILD) --// FPDF_EXPORT should be consistent with |export| in the pdfium_fuzzer --// template in testing/fuzzers/BUILD.gn. --#if defined(WIN32) --#if defined(FPDF_IMPLEMENTATION) -+#if defined(PDFIUM_DLLIMPLEMENTATION) -+#ifdef _WIN32 - #define FPDF_EXPORT __declspec(dllexport) - #else --#define FPDF_EXPORT __declspec(dllimport) --#endif // defined(FPDF_IMPLEMENTATION) + // FPDF_EXPORT should be consistent with |export| in the pdfium_fuzzer + // template in testing/fuzzers/BUILD.gn. + #if defined(WIN32) +@@ -184,9 +183,6 @@ typedef int FPDF_TEXT_RENDERMODE; + #define FPDF_EXPORT + #endif // defined(FPDF_IMPLEMENTATION) + #endif // defined(WIN32) -#else --#if defined(FPDF_IMPLEMENTATION) --#define FPDF_EXPORT __attribute__((visibility("default"))) --#else --#define FPDF_EXPORT --#endif // defined(FPDF_IMPLEMENTATION) --#endif // defined(WIN32) -+#define FPDF_EXPORT __attribute__ ((visibility("default"))) -+#endif - #else -#define FPDF_EXPORT -#endif // defined(COMPONENT_BUILD) -- --#if defined(WIN32) && defined(FPDFSDK_EXPORTS) --#define FPDF_CALLCONV __stdcall -+#ifdef _WIN32 -+#define FPDF_EXPORT __declspec(dllimport) - #else --#define FPDF_CALLCONV -+#define FPDF_EXPORT __attribute__ ((visibility("default"))) - #endif -+#endif -+#define FPDF_CALLCONV - // Exported Functions - #ifdef __cplusplus + #if defined(WIN32) && defined(FPDFSDK_EXPORTS) + #define FPDF_CALLCONV __stdcall |