1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From 8f20ea906235cbee1d4aac4706e4eb03366875bf Mon Sep 17 00:00:00 2001
From: "Tobias C. Berner" <tcberner@FreeBSD.org>
Date: Mon, 7 Jan 2019 19:50:48 +0100
Subject: [PATCH] Make compatible with poppler 0.72
---
filters/karbon/pdf/SvgOutputDev.cpp | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
index 4a1fad6bbcf..b1d4ea2d427 100644
--- a/filters/karbon/pdf/SvgOutputDev.cpp
+++ b/filters/karbon/pdf/SvgOutputDev.cpp
@@ -25,6 +25,7 @@
#include <poppler/GfxState.h>
#include <poppler/Stream.h>
#include <poppler/GfxFont.h>
+#include <poppler/glib/poppler-features.h>
#include <QFile>
#include <QTextStream>
@@ -409,7 +410,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
QString str;
+#if POPPLER_CHECK_VERSION(0,72,0)
+ const char * p = s->c_str();
+#else
const char * p = s->getCString();
+#endif
int len = s->getLength();
CharCode code;
Unicode *u = nullptr;
@@ -459,10 +464,18 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
*d->body << " y=\"" << y << "px\"";
if (font && font->getFamily()) {
+#if POPPLER_CHECK_VERSION(0,72,0)
+ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
+#else
*d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
+#endif
//debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
} else if (font && font->getName()) {
+#if POPPLER_CHECK_VERSION(0,72,0)
+ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
+#else
*d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
+#endif
//debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
}
*d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
--
2.20.1
|
GitWeb
