Improve the functions which create GdkPixbuf from Cairo surface

and vice versa. Simplifies some code.

Also introduce proper refcounting into svg_preview_cache.cpp
and fix its users.

(bzr r12512)

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;
 }