summaryrefslogtreecommitdiffstats
path: root/src/extension/internal/pdfinput/svg-builder.cpp
diff options
context:
space:
mode:
authorEduard Braun <eduard.braun2@gmx.de>2018-09-04 22:31:06 +0000
committerEduard Braun <eduard.braun2@gmx.de>2018-09-04 22:31:06 +0000
commit722e121361d0f784083d10e897155b7d4e44e515 (patch)
tree52339871445e11a58d8942f77cb634bb739aaa5c /src/extension/internal/pdfinput/svg-builder.cpp
parentfix for comment https://gitlab.com/inkscape/inkscape/commit/a12d0aecffa31fa7b... (diff)
downloadinkscape-722e121361d0f784083d10e897155b7d4e44e515.tar.gz
inkscape-722e121361d0f784083d10e897155b7d4e44e515.zip
Modified fix for compatibility with poppler 0.64
This is slightly uglier than a600c6438fef2f4c06f9a4a7d933d99fb054a973 but avoids duplicating strings (which is unnecessary and leaked memory). It's also closer to what upstream intended with the changes in 0.64.
Diffstat (limited to 'src/extension/internal/pdfinput/svg-builder.cpp')
-rw-r--r--src/extension/internal/pdfinput/svg-builder.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 50a7685b8..9d0df7c04 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -1020,9 +1020,9 @@ void SvgBuilder::updateFont(GfxState *state) {
GfxFont *font = state->getFont();
// Store original name
if (font->getName()) {
- _font_specification = g_strdup(font->getName()->getCString());
+ _font_specification = font->getName()->getCString();
} else {
- _font_specification = (char*) "Arial";
+ _font_specification = "Arial";
}
// Prune the font name to get the correct font family name
@@ -1030,7 +1030,7 @@ void SvgBuilder::updateFont(GfxState *state) {
char *font_family = nullptr;
char *font_style = nullptr;
char *font_style_lowercase = nullptr;
- char *plus_sign = strstr(_font_specification, "+");
+ const char *plus_sign = strstr(_font_specification, "+");
if (plus_sign) {
font_family = g_strdup(plus_sign + 1);
_font_specification = plus_sign + 1;