112 lines
4.0 KiB
Diff
112 lines
4.0 KiB
Diff
From a600c6438fef2f4c06f9a4a7d933d99fb054a973 Mon Sep 17 00:00:00 2001
|
|
From: Eduard Braun <eduard.braun2@gmx.de>
|
|
Date: Tue, 24 Apr 2018 19:18:26 +0200
|
|
Subject: Fix compilation with poppler 0.64
|
|
|
|
|
|
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
|
|
index 15bc2d746d..6c498f9812 100644
|
|
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
|
|
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
|
|
@@ -2582,7 +2582,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
|
|
}
|
|
}
|
|
|
|
-void PdfParser::doShowText(GooString *s) {
|
|
+void PdfParser::doShowText(const GooString *s) {
|
|
GfxFont *font;
|
|
int wMode;
|
|
double riseX, riseY;
|
|
@@ -2601,7 +2601,7 @@ void PdfParser::doShowText(GooString *s) {
|
|
font = state->getFont();
|
|
wMode = font->getWMode();
|
|
|
|
- builder->beginString(state, s);
|
|
+ builder->beginString(state);
|
|
|
|
// handle a Type 3 char
|
|
if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) {
|
|
@@ -2631,7 +2631,7 @@ void PdfParser::doShowText(GooString *s) {
|
|
double lineX = state->getLineX();
|
|
double lineY = state->getLineY();
|
|
oldParser = parser;
|
|
- p = s->getCString();
|
|
+ p = g_strdup(s->getCString());
|
|
len = s->getLength();
|
|
while (len > 0) {
|
|
n = font->getNextChar(p, len, &code,
|
|
@@ -2686,7 +2686,7 @@ void PdfParser::doShowText(GooString *s) {
|
|
|
|
} else {
|
|
state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
|
|
- p = s->getCString();
|
|
+ p = g_strdup(s->getCString());
|
|
len = s->getLength();
|
|
while (len > 0) {
|
|
n = font->getNextChar(p, len, &code,
|
|
@@ -2732,7 +2732,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
|
|
{
|
|
Object obj1, obj2, obj3, refObj;
|
|
|
|
- char *name = args[0].getName();
|
|
+ char *name = g_strdup(args[0].getName());
|
|
#if defined(POPPLER_NEW_OBJECT_API)
|
|
if ((obj1 = res->lookupXObject(name)).isNull()) {
|
|
#else
|
|
diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
|
|
index e28fecc2e1..f985b15cad 100644
|
|
--- a/src/extension/internal/pdfinput/pdf-parser.h
|
|
+++ b/src/extension/internal/pdfinput/pdf-parser.h
|
|
@@ -287,7 +287,7 @@ private:
|
|
void opMoveShowText(Object args[], int numArgs);
|
|
void opMoveSetShowText(Object args[], int numArgs);
|
|
void opShowSpaceText(Object args[], int numArgs);
|
|
- void doShowText(GooString *s);
|
|
+ void doShowText(const GooString *s);
|
|
|
|
// XObject operators
|
|
void opXObject(Object args[], int numArgs);
|
|
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
|
|
index 158c5ae068..8e5a5f6396 100644
|
|
--- a/src/extension/internal/pdfinput/svg-builder.cpp
|
|
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
|
|
@@ -1021,7 +1021,7 @@ void SvgBuilder::updateFont(GfxState *state) {
|
|
GfxFont *font = state->getFont();
|
|
// Store original name
|
|
if (font->getName()) {
|
|
- _font_specification = font->getName()->getCString();
|
|
+ _font_specification = g_strdup(font->getName()->getCString());
|
|
} else {
|
|
_font_specification = (char*) "Arial";
|
|
}
|
|
@@ -1362,7 +1362,7 @@ void SvgBuilder::_flushText() {
|
|
_glyphs.clear();
|
|
}
|
|
|
|
-void SvgBuilder::beginString(GfxState *state, GooString * /*s*/) {
|
|
+void SvgBuilder::beginString(GfxState *state) {
|
|
if (_need_font_update) {
|
|
updateFont(state);
|
|
}
|
|
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
|
|
index ad15c9c06f..ed2a4d48e0 100644
|
|
--- a/src/extension/internal/pdfinput/svg-builder.h
|
|
+++ b/src/extension/internal/pdfinput/svg-builder.h
|
|
@@ -29,7 +29,6 @@ namespace Inkscape {
|
|
#include <glibmm/ustring.h>
|
|
|
|
#include "CharTypes.h"
|
|
-class GooString;
|
|
class Function;
|
|
class GfxState;
|
|
struct GfxColor;
|
|
@@ -136,7 +135,7 @@ public:
|
|
void clearSoftMask(GfxState *state);
|
|
|
|
// Text handling
|
|
- void beginString(GfxState *state, GooString *s);
|
|
+ void beginString(GfxState *state);
|
|
void endString(GfxState *state);
|
|
void addChar(GfxState *state, double x, double y,
|
|
double dx, double dy,
|