diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-09-17 16:57:02 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-09-17 16:57:02 +0000 |
| commit | 909d0457495fa1d5f3cfe7065fd68d4021c0d291 (patch) | |
| tree | 33cb19d99eafde178bcc0b08316fba1568ed5fb7 /src/widgets/stroke-marker-selector.cpp | |
| parent | update to trunk (diff) | |
| parent | Fix for Bug #1217602 (Measure Path fails with XML too deep error) by dave m. (diff) | |
| download | inkscape-909d0457495fa1d5f3cfe7065fd68d4021c0d291.tar.gz inkscape-909d0457495fa1d5f3cfe7065fd68d4021c0d291.zip | |
Update to trunk
(bzr r11950.1.140)
Diffstat (limited to 'src/widgets/stroke-marker-selector.cpp')
| -rw-r--r-- | src/widgets/stroke-marker-selector.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/stroke-marker-selector.cpp b/src/widgets/stroke-marker-selector.cpp index 2d1c932d3..00b6b5c91 100644 --- a/src/widgets/stroke-marker-selector.cpp +++ b/src/widgets/stroke-marker-selector.cpp @@ -544,16 +544,16 @@ MarkerComboBox::create_marker_image(unsigned psize, gchar const *mname, gchar *cache_name = g_strconcat(combo_id, mname, NULL); Glib::ustring key = svg_preview_cache.cache_key(source->getURI(), cache_name, psize); g_free (cache_name); - Glib::RefPtr<Gdk::Pixbuf> pixbuf = Glib::wrap(svg_preview_cache.get_preview_from_cache(key)); + GdkPixbuf *pixbuf = svg_preview_cache.get_preview_from_cache(key); // no ref created if (!pixbuf) { - pixbuf = Glib::wrap(render_pixbuf(drawing, 0.8, *dbox, psize)); - svg_preview_cache.set_preview_in_cache(key, pixbuf->gobj()); + pixbuf = render_pixbuf(drawing, 0.8, *dbox, psize); + svg_preview_cache.set_preview_in_cache(key, pixbuf); + g_object_unref(pixbuf); // reference is held by svg_preview_cache } // Create widget - Gtk::Image *pb = new Gtk::Image(pixbuf); - + Gtk::Image *pb = Glib::wrap(GTK_IMAGE(gtk_image_new_from_pixbuf(pixbuf))); return pb; } |