diff options
| author | Martin Owens <doctormo@gmail.com> | 2018-09-10 15:57:11 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2018-09-10 15:57:11 +0000 |
| commit | 88d8b781054039704afb495845c536d389afb3cb (patch) | |
| tree | 228a8075a36d520f92b491e95d2f0f0a5623733b /src/extension/internal/pdfinput/svg-builder.cpp | |
| parent | Fix bug #167900 (diff) | |
| parent | CMake: Install extensions after switch to submodule (diff) | |
| download | inkscape-88d8b781054039704afb495845c536d389afb3cb.tar.gz inkscape-88d8b781054039704afb495845c536d389afb3cb.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape into yhoshi/inkscape-bug167900
Diffstat (limited to 'src/extension/internal/pdfinput/svg-builder.cpp')
| -rw-r--r-- | src/extension/internal/pdfinput/svg-builder.cpp | 6 |
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; |