casa-mp-base

From b5360a807b12d4e8318475ffd0464b84882788b5 Mon Sep 17 00:00:00 2001

From: Jan Tojnar <jtojnar@gmail.com>

Date: Tue, 3 Dec 2019 00:17:05 +0100

Subject: [PATCH] Fix build with Poppler 0.83.0

​

(cherry picked from commit 51351358a62acb6887eab49bc0dc4a7a3d18c17a)

---

 src/extension/internal/pdfinput/pdf-input.cpp        |  6 +++---

 src/extension/internal/pdfinput/pdf-parser.cpp       |  4 ++--

 .../internal/pdfinput/poppler-transition-api.h       | 12 ++++++++++++

 src/extension/internal/pdfinput/svg-builder.cpp      |  4 ++--

 4 files changed, 19 insertions(+), 7 deletions(-)

​

diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp

index 9621e306a0..7027b7e642 100644

--- src/extension/internal/pdfinput/pdf-input.cpp

+++ src/extension/internal/pdfinput/pdf-input.cpp

@@ -689,12 +689,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {

         //

         gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");

         if (poppler_datadir != NULL) {

-            globalParams = new GlobalParams(poppler_datadir);

+            globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir);

         } else {

-            globalParams = new GlobalParams();

+            globalParams = _POPPLER_NEW_GLOBAL_PARAMS();

         }

 #else

-        globalParams = new GlobalParams();

+        globalParams = _POPPLER_NEW_GLOBAL_PARAMS();

 #endif // ENABLE_OSX_APP_LOCATIONS

     }

diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp

index e71bb79381..2ff448828d 100644

--- src/extension/internal/pdfinput/pdf-parser.cpp

+++ src/extension/internal/pdfinput/pdf-parser.cpp

@@ -272,7 +272,7 @@ public:

     ClipHistoryEntry *save();

     ClipHistoryEntry *restore();

     GBool hasSaves() { return saved != NULL; }

-    void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal);

+    void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal);

     GfxPath *getClipPath() { return clipPath; }

     GfxClipType getClipType() { return clipType; }

@@ -3394,7 +3394,7 @@ ClipHistoryEntry::~ClipHistoryEntry()

     }

 }

-void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) {

+void ClipHistoryEntry::setClip(_POPPLER_CONST_83 GfxPath *clipPathA, GfxClipType clipTypeA) {

     // Free previous clip path

     if (clipPath) {

         delete clipPath;

diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h

index 93c0f99ba1..1118c0849f 100644

--- src/extension/internal/pdfinput/poppler-transition-api.h

+++ src/extension/internal/pdfinput/poppler-transition-api.h

@@ -3,6 +3,12 @@

 #include <glib/poppler-features.h>