summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Holder <thomas@thomas-holder.de>2019-10-26 12:39:31 +0000
committerThomas Holder <thomas@thomas-holder.de>2019-10-26 15:19:49 +0000
commit324c7903d9fd62e74c042c31477299be3b980fd2 (patch)
treeafc10463a0e2a56ac9e18aaab66872a6ad104b7d
parentUpdate it.po (diff)
downloadinkscape-324c7903d9fd62e74c042c31477299be3b980fd2.tar.gz
inkscape-324c7903d9fd62e74c042c31477299be3b980fd2.zip
fix poppler 0.82.0 build
-rw-r--r--src/extension/internal/pdfinput/pdf-parser.cpp2
-rw-r--r--src/extension/internal/pdfinput/poppler-transition-api.h6
-rw-r--r--src/extension/internal/pdfinput/svg-builder.cpp2
-rw-r--r--src/extension/internal/pdfinput/svg-builder.h2
4 files changed, 9 insertions, 3 deletions
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 4f798e35b..4eae27575 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -2405,7 +2405,7 @@ void PdfParser::doShowText(GooString *s) {
int wMode;
double riseX, riseY;
CharCode code;
- Unicode *u = nullptr;
+ Unicode _POPPLER_CONST_82 *u = nullptr;
double x, y, dx, dy, tdx, tdy;
double originX, originY, tOriginX, tOriginY;
double oldCTM[6], newCTM[6];
diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
index 5e8bc4ae9..01834007e 100644
--- a/src/extension/internal/pdfinput/poppler-transition-api.h
+++ b/src/extension/internal/pdfinput/poppler-transition-api.h
@@ -14,6 +14,12 @@
#include <glib/poppler-features.h>
+#if POPPLER_CHECK_VERSION(0, 82, 0)
+#define _POPPLER_CONST_82 const
+#else
+#define _POPPLER_CONST_82
+#endif
+
#if POPPLER_CHECK_VERSION(0, 76, 0)
#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
#else
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 14727eba5..a7134684a 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -1395,7 +1395,7 @@ void SvgBuilder::beginString(GfxState *state) {
void SvgBuilder::addChar(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
- CharCode /*code*/, int /*nBytes*/, Unicode *u, int uLen) {
+ CharCode /*code*/, int /*nBytes*/, Unicode const *u, int uLen) {
bool is_space = ( uLen == 1 && u[0] == 32 );
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
index c42d694de..050465d4b 100644
--- a/src/extension/internal/pdfinput/svg-builder.h
+++ b/src/extension/internal/pdfinput/svg-builder.h
@@ -142,7 +142,7 @@ public:
void addChar(GfxState *state, double x, double y,
double dx, double dy,
double originX, double originY,
- CharCode code, int nBytes, Unicode *u, int uLen);
+ CharCode code, int nBytes, Unicode const *u, int uLen);
void beginTextObject(GfxState *state);
void endTextObject(GfxState *state);