diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-09-30 09:38:37 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-09-30 09:38:37 +0000 |
| commit | acf5c7612afc02aee6ddf079d2ea77e13bb82e1b (patch) | |
| tree | 8af7a0de9007c10f5e3a8d00676b162e35a74929 /src/sp-item.cpp | |
| parent | update to trunk (diff) | |
| parent | Reduce tools-switcher code, add description for node and select toos. (diff) | |
| download | inkscape-acf5c7612afc02aee6ddf079d2ea77e13bb82e1b.tar.gz inkscape-acf5c7612afc02aee6ddf079d2ea77e13bb82e1b.zip | |
Update to trunk
(bzr r11950.1.156)
Diffstat (limited to 'src/sp-item.cpp')
| -rw-r--r-- | src/sp-item.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/sp-item.cpp b/src/sp-item.cpp index a99bf85cc..c342bfd9b 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -665,16 +665,20 @@ Inkscape::XML::Node* SPItem::write(Inkscape::XML::Document *xml_doc, Inkscape::X if (item->clip_ref){ if (item->clip_ref->getObject()) { - const gchar *value = g_strdup_printf ("url(%s)", item->clip_ref->getURI()->toString()); + gchar *uri = item->clip_ref->getURI()->toString(); + const gchar *value = g_strdup_printf ("url(%s)", uri); repr->setAttribute ("clip-path", value); g_free ((void *) value); + g_free ((void *) uri); } } if (item->mask_ref){ if (item->mask_ref->getObject()) { - const gchar *value = g_strdup_printf ("url(%s)", item->mask_ref->getURI()->toString()); + gchar *uri = item->mask_ref->getURI()->toString(); + const gchar *value = g_strdup_printf ("url(%s)", uri); repr->setAttribute ("mask", value); g_free ((void *) value); + g_free ((void *) uri); } } @@ -721,7 +725,7 @@ Geom::OptRect SPItem::visualBounds(Geom::Affine const &transform) const // call the subclass method // CPPIFY //bbox = this->bbox(Geom::identity(), SPItem::VISUAL_BBOX); - bbox = const_cast<SPItem*>(this)->bbox(Geom::identity(), SPItem::VISUAL_BBOX); + bbox = const_cast<SPItem*>(this)->bbox(Geom::identity(), SPItem::GEOMETRIC_BBOX); // see LP Bug 1229971 SPFilter *filter = SP_FILTER(style->getFilter()); // default filer area per the SVG spec: |