summaryrefslogtreecommitdiffstats
path: root/src/extension
diff options
context:
space:
mode:
authorMarc Jeanmougin <marc@jeanmougin.fr>2018-09-13 14:17:00 +0000
committerMarc Jeanmougin <marc@jeanmougin.fr>2018-09-13 14:17:00 +0000
commit6496875e6e3b594c5b1d4f412a23c7dc1c6aee18 (patch)
tree8e587b7331b4b0737ee6f20df1f7602756b9d4cc /src/extension
parentupdate POTFILES.in (diff)
parentFix a meassure tooltip updated pointed by maren at hacfest, tooltip is not up... (diff)
downloadinkscape-6496875e6e3b594c5b1d4f412a23c7dc1c6aee18.tar.gz
inkscape-6496875e6e3b594c5b1d4f412a23c7dc1c6aee18.zip
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/extension')
-rw-r--r--src/extension/internal/svg.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index d39f5a960..e4586ec5f 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -245,8 +245,8 @@ Svg::open (Inkscape::Extension::Input *mod, const gchar *uri)
// Added 11 Feb 2014 as we now honor "preserveAspectRatio" and this is
// what Inkscaper's expect.
image_node->setAttribute("preserveAspectRatio", "none");
- Glib::ustring svgdpi = Glib::ustring::format(mod->get_param_float("svgdpi"));
- image_node->setAttribute("inkscape:svg-dpi", svgdpi.c_str());
+ double svgdpi = mod->get_param_float("svgdpi");
+ image_node->setAttribute("inkscape:svg-dpi", Glib::ustring::format(svgdpi).c_str());
image_node->setAttribute("width", Glib::ustring::format(width));
image_node->setAttribute("height", Glib::ustring::format(height));
Glib::ustring scale = prefs->getString("/dialogs/import/scale");
@@ -258,7 +258,7 @@ Svg::open (Inkscape::Extension::Input *mod, const gchar *uri)
}
// convert filename to uri
if (embed) {
- std::unique_ptr<Inkscape::Pixbuf> pb(Inkscape::Pixbuf::create_from_file(uri, svgdpi.c_str()));
+ std::unique_ptr<Inkscape::Pixbuf> pb(Inkscape::Pixbuf::create_from_file(uri, svgdpi));
if(pb) {
sp_embed_svg(image_node, uri);
}