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)

3 files changed, 130 insertions, 142 deletions

diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
index 51483a9c4..afc81e574 100644
--- a/src/widgets/dash-selector.cpp
+++ b/src/widgets/dash-selector.cpp
@@ -238,58 +238,50 @@ void SPDashSelector::get_dash(int *ndash, double **dash, double *off)
 /**
  * Fill a pixbuf with the dash pattern using standard cairo drawing
  */
-GdkPixbuf* SPDashSelector::sp_dash_to_pixbuf(double *pattern) {
-
-        int n_dashes;
-        for (n_dashes = 0; pattern[n_dashes] >= 0.0; n_dashes ++) ;
-
-        cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, preview_width, preview_height);
-        cairo_t *ct = cairo_create(s);
-
-        cairo_set_line_width (ct, preview_lineheight);
-        cairo_scale (ct, preview_lineheight, 1);
-        //cairo_set_source_rgb (ct, 0, 0, 0);
-        cairo_move_to (ct, 0, preview_height/2);
-        cairo_line_to (ct, preview_width, preview_height/2);
-        cairo_set_dash(ct, pattern, n_dashes, 0);
-        cairo_stroke (ct);
-
-        cairo_destroy(ct);
-        cairo_surface_flush(s);
-
-        GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( cairo_image_surface_get_data(s),
-                                                   GDK_COLORSPACE_RGB, TRUE, 8,
-                                                   preview_width, preview_height, cairo_image_surface_get_stride(s),
-                                                   ink_cairo_pixbuf_cleanup, s);
-        convert_pixbuf_argb32_to_normal(pixbuf);
-        return pixbuf;
+GdkPixbuf* SPDashSelector::sp_dash_to_pixbuf(double *pattern)
+{
+    int n_dashes;
+    for (n_dashes = 0; pattern[n_dashes] >= 0.0; n_dashes ++) ;
+
+    cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, preview_width, preview_height);
+    cairo_t *ct = cairo_create(s);
+
+    cairo_set_line_width (ct, preview_lineheight);
+    cairo_scale (ct, preview_lineheight, 1);
+    //cairo_set_source_rgb (ct, 0, 0, 0);
+    cairo_move_to (ct, 0, preview_height/2);
+    cairo_line_to (ct, preview_width, preview_height/2);
+    cairo_set_dash(ct, pattern, n_dashes, 0);
+    cairo_stroke (ct);
+
+    cairo_destroy(ct);
+    cairo_surface_flush(s);
+
+    GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s);
+    return pixbuf;
 }
 
 /**
  * Fill a pixbuf with a text label using standard cairo drawing
  */
-GdkPixbuf* SPDashSelector::sp_text_to_pixbuf(char *text) {
-
-        cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, preview_width, preview_height);
-        cairo_t *ct = cairo_create(s);
+GdkPixbuf* SPDashSelector::sp_text_to_pixbuf(char *text)
+{
+    cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, preview_width, preview_height);
+    cairo_t *ct = cairo_create(s);
 
-        cairo_select_font_face (ct, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-        cairo_set_font_size (ct, 12.0);
-        cairo_set_source_rgb (ct, 0.0, 0.0, 0.0);
-        cairo_move_to (ct, 16.0, 13.0);
-        cairo_show_text (ct, text);
+    cairo_select_font_face (ct, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size (ct, 12.0);
+    cairo_set_source_rgb (ct, 0.0, 0.0, 0.0);
+    cairo_move_to (ct, 16.0, 13.0);
+    cairo_show_text (ct, text);
 
-        cairo_stroke (ct);
+    cairo_stroke (ct);
 
-        cairo_destroy(ct);
-        cairo_surface_flush(s);
+    cairo_destroy(ct);
+    cairo_surface_flush(s);
 
-        GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( cairo_image_surface_get_data(s),
-                                                   GDK_COLORSPACE_RGB, TRUE, 8,
-                                                   preview_width, preview_height, cairo_image_surface_get_stride(s),
-                                                   ink_cairo_pixbuf_cleanup, s);
-        convert_pixbuf_argb32_to_normal(pixbuf);
-        return pixbuf;
+    GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s);
+    return pixbuf;
 }
 
 void SPDashSelector::on_selection ()
diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp
index 2d58355db..9a5dd4996 100644
--- a/src/widgets/gradient-image.cpp
+++ b/src/widgets/gradient-image.cpp
@@ -31,11 +31,11 @@ static void sp_gradient_image_size_request (GtkWidget *widget, GtkRequisition *r
 static void sp_gradient_image_destroy(GtkWidget *object);
 static void sp_gradient_image_get_preferred_width(GtkWidget *widget, 
                                                    gint *minimal_width,
-						   gint *natural_width);
+                                                   gint *natural_width);
 
 static void sp_gradient_image_get_preferred_height(GtkWidget *widget, 
                                                     gint *minimal_height,
-						    gint *natural_height);
+                                                    gint *natural_height);
 #else
 static void sp_gradient_image_destroy(GtkObject *object);
 static gboolean sp_gradient_image_expose(GtkWidget *widget, GdkEventExpose *event);
@@ -50,53 +50,53 @@ static GtkWidgetClass *parent_class;
 
 GType sp_gradient_image_get_type(void)
 {
-	static GType type = 0;
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (SPGradientImageClass),
-			NULL, NULL,
-			(GClassInitFunc) sp_gradient_image_class_init,
-			NULL, NULL,
-			sizeof (SPGradientImage),
-			0,
-			(GInstanceInitFunc) sp_gradient_image_init,
-			NULL
-		};
-		type = g_type_register_static (GTK_TYPE_WIDGET, "SPGradientImage", &info, (GTypeFlags)0);
-	}
-	return type;
+        static GType type = 0;
+        if (!type) {
+                GTypeInfo info = {
+                        sizeof (SPGradientImageClass),
+                        NULL, NULL,
+                        (GClassInitFunc) sp_gradient_image_class_init,
+                        NULL, NULL,
+                        sizeof (SPGradientImage),
+                        0,
+                        (GInstanceInitFunc) sp_gradient_image_init,
+                        NULL
+                };
+                type = g_type_register_static (GTK_TYPE_WIDGET, "SPGradientImage", &info, (GTypeFlags)0);
+        }
+        return type;
 }
 
 static void sp_gradient_image_class_init(SPGradientImageClass *klass)
 {
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
-	parent_class = GTK_WIDGET_CLASS(g_type_class_peek_parent (klass));
+        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
+        parent_class = GTK_WIDGET_CLASS(g_type_class_peek_parent (klass));
 
 #if GTK_CHECK_VERSION(3,0,0)
-//	GObjectClass *object_class = G_OBJECT_CLASS(klass); 
+//      GObjectClass *object_class = G_OBJECT_CLASS(klass); 
 
-	widget_class->get_preferred_width = sp_gradient_image_get_preferred_width;
-	widget_class->get_preferred_height = sp_gradient_image_get_preferred_height;
-	widget_class->draw = sp_gradient_image_draw;
-	widget_class->destroy = sp_gradient_image_destroy;
+        widget_class->get_preferred_width = sp_gradient_image_get_preferred_width;
+        widget_class->get_preferred_height = sp_gradient_image_get_preferred_height;
+        widget_class->draw = sp_gradient_image_draw;
+        widget_class->destroy = sp_gradient_image_destroy;
 #else
-	GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
+        GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
 
-	object_class->destroy = sp_gradient_image_destroy;
-	widget_class->size_request = sp_gradient_image_size_request;
-	widget_class->expose_event = sp_gradient_image_expose;
+        object_class->destroy = sp_gradient_image_destroy;
+        widget_class->size_request = sp_gradient_image_size_request;
+        widget_class->expose_event = sp_gradient_image_expose;
 #endif
 }
 
 static void
 sp_gradient_image_init (SPGradientImage *image)
 {
-	gtk_widget_set_has_window (GTK_WIDGET(image), FALSE);
+        gtk_widget_set_has_window (GTK_WIDGET(image), FALSE);
 
-	image->gradient = NULL;
+        image->gradient = NULL;
 
-	new (&image->release_connection) sigc::connection();
-	new (&image->modified_connection) sigc::connection();
+        new (&image->release_connection) sigc::connection();
+        new (&image->modified_connection) sigc::connection();
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
@@ -105,23 +105,23 @@ static void sp_gradient_image_destroy(GtkWidget *object)
 static void sp_gradient_image_destroy(GtkObject *object)
 #endif
 {
-	SPGradientImage *image = SP_GRADIENT_IMAGE (object);
+        SPGradientImage *image = SP_GRADIENT_IMAGE (object);
 
-	if (image->gradient) {
-		image->release_connection.disconnect();
-		image->modified_connection.disconnect();
-		image->gradient = NULL;
-	}
+        if (image->gradient) {
+                image->release_connection.disconnect();
+                image->modified_connection.disconnect();
+                image->gradient = NULL;
+        }
 
-	image->release_connection.~connection();
-	image->modified_connection.~connection();
+        image->release_connection.~connection();
+        image->modified_connection.~connection();
 
 #if GTK_CHECK_VERSION(3,0,0)
-	if (parent_class->destroy)
-		(* (parent_class)->destroy) (object);
+        if (parent_class->destroy)
+                (* (parent_class)->destroy) (object);
 #else
-	if ((GTK_OBJECT_CLASS(parent_class))->destroy)
-		(* (GTK_OBJECT_CLASS(parent_class))->destroy) (object);
+        if ((GTK_OBJECT_CLASS(parent_class))->destroy)
+                (* (GTK_OBJECT_CLASS(parent_class))->destroy) (object);
 #endif
 }
 
@@ -134,36 +134,36 @@ static void sp_gradient_image_size_request(GtkWidget * /*widget*/, GtkRequisitio
 #if GTK_CHECK_VERSION(3,0,0)
 static void sp_gradient_image_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width)
 {
-	GtkRequisition requisition;
-	sp_gradient_image_size_request(widget, &requisition);
-	*minimal_width = *natural_width = requisition.width;
+        GtkRequisition requisition;
+        sp_gradient_image_size_request(widget, &requisition);
+        *minimal_width = *natural_width = requisition.width;
 }
 
 static void sp_gradient_image_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
 {
-	GtkRequisition requisition;
-	sp_gradient_image_size_request(widget, &requisition);
-	*minimal_height = *natural_height = requisition.height;
+        GtkRequisition requisition;
+        sp_gradient_image_size_request(widget, &requisition);
+        *minimal_height = *natural_height = requisition.height;
 }
 #endif
 
 #if !GTK_CHECK_VERSION(3,0,0)
 static gboolean sp_gradient_image_expose(GtkWidget *widget, GdkEventExpose *event)
 {
-	gboolean result = TRUE;
-	if(gtk_widget_is_drawable(widget)) {
-		cairo_t *ct = gdk_cairo_create(gtk_widget_get_window (widget));
-		cairo_rectangle(ct, event->area.x, event->area.y,
-				event->area.width, event->area.height);
-		cairo_clip(ct);
-		GtkAllocation allocation;
-		gtk_widget_get_allocation(widget, &allocation);
-		cairo_translate(ct, allocation.x, allocation.y);
-		result = sp_gradient_image_draw(widget, ct);
-		cairo_destroy(ct);
-	}
-
-	return result;
+        gboolean result = TRUE;
+        if(gtk_widget_is_drawable(widget)) {
+                cairo_t *ct = gdk_cairo_create(gtk_widget_get_window (widget));
+                cairo_rectangle(ct, event->area.x, event->area.y,
+                                event->area.width, event->area.height);
+                cairo_clip(ct);
+                GtkAllocation allocation;
+                gtk_widget_get_allocation(widget, &allocation);
+                cairo_translate(ct, allocation.x, allocation.y);
+                result = sp_gradient_image_draw(widget, ct);
+                cairo_destroy(ct);
+        }
+
+        return result;
 }
 #endif
 
@@ -179,7 +179,7 @@ static gboolean sp_gradient_image_draw(GtkWidget *widget, cairo_t *ct)
     cairo_paint(ct);
     cairo_pattern_destroy(check);
 
-	if (gr) {
+        if (gr) {
         cairo_pattern_t *p = sp_gradient_create_preview_pattern(gr, allocation.width);
         cairo_set_source(ct, p);
         cairo_paint(ct);
@@ -192,11 +192,11 @@ static gboolean sp_gradient_image_draw(GtkWidget *widget, cairo_t *ct)
 GtkWidget *
 sp_gradient_image_new (SPGradient *gradient)
 {
-	SPGradientImage *image = SP_GRADIENT_IMAGE(g_object_new(SP_TYPE_GRADIENT_IMAGE, NULL));
+        SPGradientImage *image = SP_GRADIENT_IMAGE(g_object_new(SP_TYPE_GRADIENT_IMAGE, NULL));
 
-	sp_gradient_image_set_gradient (image, gradient);
+        sp_gradient_image_set_gradient (image, gradient);
 
-	return GTK_WIDGET(image);
+        return GTK_WIDGET(image);
 }
 
 GdkPixbuf*
@@ -220,12 +220,8 @@ sp_gradient_to_pixbuf (SPGradient *gr, int width, int height)
     cairo_destroy(ct);
     cairo_surface_flush(s);
 
-    GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( cairo_image_surface_get_data(s),
-                                               GDK_COLORSPACE_RGB, TRUE, 8,
-                                               width, height, cairo_image_surface_get_stride(s),
-                                               ink_cairo_pixbuf_cleanup, s);
-    convert_pixbuf_argb32_to_normal(pixbuf);
-
+    // no need to free s - the call below takes ownership
+    GdkPixbuf *pixbuf = ink_pixbuf_create_from_cairo_surface(s);
     return pixbuf;
 }
 
@@ -233,44 +229,44 @@ sp_gradient_to_pixbuf (SPGradient *gr, int width, int height)
 void
 sp_gradient_image_set_gradient (SPGradientImage *image, SPGradient *gradient)
 {
-	if (image->gradient) {
-		image->release_connection.disconnect();
-		image->modified_connection.disconnect();
-	}
+        if (image->gradient) {
+                image->release_connection.disconnect();
+                image->modified_connection.disconnect();
+        }
 
-	image->gradient = gradient;
+        image->gradient = gradient;
 
-	if (gradient) {
-		image->release_connection = gradient->connectRelease(sigc::bind<1>(sigc::ptr_fun(&sp_gradient_image_gradient_release), image));
-		image->modified_connection = gradient->connectModified(sigc::bind<2>(sigc::ptr_fun(&sp_gradient_image_gradient_modified), image));
-	}
+        if (gradient) {
+                image->release_connection = gradient->connectRelease(sigc::bind<1>(sigc::ptr_fun(&sp_gradient_image_gradient_release), image));
+                image->modified_connection = gradient->connectModified(sigc::bind<2>(sigc::ptr_fun(&sp_gradient_image_gradient_modified), image));
+        }
 
-	sp_gradient_image_update (image);
+        sp_gradient_image_update (image);
 }
 
 static void
 sp_gradient_image_gradient_release (SPObject *, SPGradientImage *image)
 {
-	if (image->gradient) {
-		image->release_connection.disconnect();
-		image->modified_connection.disconnect();
-	}
+        if (image->gradient) {
+                image->release_connection.disconnect();
+                image->modified_connection.disconnect();
+        }
 
-	image->gradient = NULL;
+        image->gradient = NULL;
 
-	sp_gradient_image_update (image);
+        sp_gradient_image_update (image);
 }
 
 static void
 sp_gradient_image_gradient_modified (SPObject *, guint /*flags*/, SPGradientImage *image)
 {
-	sp_gradient_image_update (image);
+        sp_gradient_image_update (image);
 }
 
 static void
 sp_gradient_image_update (SPGradientImage *image)
 {
-	if (gtk_widget_is_drawable (GTK_WIDGET(image))) {
-		gtk_widget_queue_draw (GTK_WIDGET (image));
-	}
+        if (gtk_widget_is_drawable (GTK_WIDGET(image))) {
+                gtk_widget_queue_draw (GTK_WIDGET (image));
+        }
 }
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;
 }