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)

16 files changed, 397 insertions, 328 deletions

diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index fc56c7b26..2726c9d5a 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -28,16 +28,13 @@
 #include "helper/geom-curves.h"
 #include "display/cairo-templates.h"
 
-namespace {
-
 /**
  * Key for cairo_surface_t to keep track of current color interpolation value
  * Only the address of the structure is used, it is never initialized. See:
  * http://www.cairographics.org/manual/cairo-Types.html#cairo-user-data-key-t
  */
-cairo_user_data_key_t ci_key;
-
-} // namespace
+cairo_user_data_key_t ink_color_interpolation_key;
+cairo_user_data_key_t ink_pixbuf_key;
 
 namespace Inkscape {
 
@@ -291,7 +288,7 @@ feed_pathvector_to_cairo (cairo_t *ct, Geom::PathVector const &pathv)
 
 SPColorInterpolation
 get_cairo_surface_ci(cairo_surface_t *surface) {
-    void* data = cairo_surface_get_user_data( surface, &ci_key );
+    void* data = cairo_surface_get_user_data( surface, &ink_color_interpolation_key );
     if( data != NULL ) {
         return (SPColorInterpolation)GPOINTER_TO_INT( data );
     } else {
@@ -317,13 +314,13 @@ set_cairo_surface_ci(cairo_surface_t *surface, SPColorInterpolation ci) {
             ink_cairo_surface_linear_to_srgb( surface );
         }
 
-        cairo_surface_set_user_data(surface, &ci_key, GINT_TO_POINTER (ci), NULL);
+        cairo_surface_set_user_data(surface, &ink_color_interpolation_key, GINT_TO_POINTER (ci), NULL);
     }
 }
 
 void
 copy_cairo_surface_ci(cairo_surface_t *in, cairo_surface_t *out) {
-    cairo_surface_set_user_data(out, &ci_key, cairo_surface_get_user_data(in, &ci_key), NULL);
+    cairo_surface_set_user_data(out, &ink_color_interpolation_key, cairo_surface_get_user_data(in, &ink_color_interpolation_key), NULL);
 }
 
 void
@@ -375,27 +372,113 @@ ink_cairo_pattern_set_matrix(cairo_pattern_t *cp, Geom::Affine const &m)
 }
 
 void
-ink_cairo_set_source_argb32_pixbuf(cairo_t *ct, GdkPixbuf *pb, double x, double y)
+ink_cairo_set_source_pixbuf(cairo_t *ct, GdkPixbuf *pb, double x, double y)
 {
-    cairo_surface_t *pbs = ink_cairo_surface_create_for_argb32_pixbuf(pb);
+    cairo_surface_t *pbs = ink_cairo_surface_get_for_pixbuf(pb);
     cairo_set_source_surface(ct, pbs, x, y);
-    cairo_surface_destroy(pbs);
 }
 
+/* The functions below implement the following hack:
+ * 
+ * The pixels formats of Cairo and GdkPixbuf are different.
+ * GdkPixbuf accesses pixels as bytes, alpha is not premultiplied,
+ * and successive bytes of a single pixel contain R, G, B and A components.
+ * Cairo accesses pixels as 32-bit ints, alpha is premultiplied,
+ * and each int contains as 0xAARRGGBB, accessed with bitwise operations.
+ *
+ * In other words, on a little endian system, a GdkPixbuf will contain:
+ *   char *data = "rgbargbargba...."
+ *   int *data = { 0xAABBGGRR, 0xAABBGGRR, 0xAABBGGRR, ... }
+ * while a Cairo image surface will contain:
+ *   char *data = "bgrabgrabgra...."
+ *   int *data = { 0xAARRGGBB, 0xAARRGGBB, 0xAARRGGBB, ... }
+ *
+ * It is possible to convert between these two formats (almost) losslessly.
+ * Some color information from partially transparent regions of the image
+ * is lost, but the result when displaying this image will remain the same.
+ *
+ * The functions below allow interoperation between GdkPixbuf
+ * and Cairo surfaces, allowing pixbufs to be used as Cairo sources,
+ * and saving Cairo surfaces using GdkPixbuf APIs.
+ * This is implemented by creating a GdkPixbuf and a Cairo image surface
+ * which share their data. Depending on what is needed at a given time,
+ * the pixels are converted in place to the Cairo or the GdkPixbuf format.
+ * In this way, only one copy of the image data is needed.
+ *
+ * Given either a GdkPixbuf or a Cairo surface, these functions create
+ * the other object and convert to its format. The returned object should be
+ * freed using cairo_surface_destroy or g_object_unref when it's no longer
+ * needed.
+ *
+ * Memory ownership semantics:
+ * Regardless of whether the pixels are stored in memory originally belonging
+ * to Cairo surface or to GdkPixbuf, the GdkPixbuf is the master object.
+ * To free the memory, unref the GdkPixbuf ONLY.
+ */
+
+/**
+ * Converts the pixbuf to Cairo pixel format and returns an image surface
+ * which can be used as a source.
+ *
+ * The returned surface should be unreferenced
+ * with cairo_surface_destroy() once it's no longer needed.
+ * Calling this function causes the pixbuf to be unsuitable for use
+ * with GTK drawing functions.
+ */
 cairo_surface_t *
-ink_cairo_surface_create_for_argb32_pixbuf(GdkPixbuf *pb)
+ink_cairo_surface_get_for_pixbuf(GdkPixbuf *pb)
 {
-    guchar *data = gdk_pixbuf_get_pixels(pb);
-    int w = gdk_pixbuf_get_width(pb);
-    int h = gdk_pixbuf_get_height(pb);
-    int stride = gdk_pixbuf_get_rowstride(pb);
+    cairo_surface_t *pbs =
+        reinterpret_cast<cairo_surface_t*>(g_object_get_data(G_OBJECT(pb), "cairo_surface"));
+
+    ink_pixbuf_ensure_argb32(pb);
+
+    if (pbs == NULL) {
+        guchar *data = gdk_pixbuf_get_pixels(pb);
+        int w = gdk_pixbuf_get_width(pb);
+        int h = gdk_pixbuf_get_height(pb);
+        int stride = gdk_pixbuf_get_rowstride(pb);
+
+        // create a surface that stores the data
+        cairo_surface_t *pbs = cairo_image_surface_create_for_data(
+            data, CAIRO_FORMAT_ARGB32, w, h, stride);
+
+        g_object_set_data_full(G_OBJECT(pb), "cairo_surface", pbs, (GDestroyNotify) cairo_surface_destroy);
+        cairo_surface_set_user_data(pbs, &ink_pixbuf_key, pb, NULL);
+    }
 
-    cairo_surface_t *pbs = cairo_image_surface_create_for_data(
-        data, CAIRO_FORMAT_ARGB32, w, h, stride);
     return pbs;
 }
 
 /**
+ * Converts the Cairo surface to GdkPixbuf pixel format.
+ * GdkPixbuf takes ownership of the passed surface reference,
+ * so it should NOT be freed after calling this function.
+ */
+GdkPixbuf *ink_pixbuf_create_from_cairo_surface(cairo_surface_t *s)
+{
+    GdkPixbuf *pb = reinterpret_cast<GdkPixbuf*>(cairo_surface_get_user_data(s, &ink_pixbuf_key));
+    if (pb == NULL) {
+        pb = gdk_pixbuf_new_from_data(
+            cairo_image_surface_get_data(s), GDK_COLORSPACE_RGB, TRUE, 8,
+            cairo_image_surface_get_width(s), cairo_image_surface_get_height(s),
+            cairo_image_surface_get_stride(s), NULL, NULL);
+
+        g_object_set_data_full(G_OBJECT(pb), "pixel_format", g_strdup("argb32"), g_free);
+        g_object_set_data_full(G_OBJECT(pb), "cairo_surface", s, (GDestroyNotify) cairo_surface_destroy);
+
+        cairo_surface_set_user_data(s, &ink_pixbuf_key, pb, NULL);
+    } else {
+        g_warning("Received surface which is already owned by GdkPixbuf");
+        g_object_ref(pb);
+    }
+
+    ink_pixbuf_ensure_normal(pb);
+
+    return pb;
+}
+
+/**
  * Cleanup function for GdkPixbuf.
  * This function should be passed as the GdkPixbufDestroyNotify parameter
  * to gdk_pixbuf_new_from_data when creating a GdkPixbuf backed by
@@ -445,7 +528,7 @@ cairo_surface_t *
 ink_cairo_surface_create_identical(cairo_surface_t *s)
 {
     cairo_surface_t *ns = ink_cairo_surface_create_same_size(s, cairo_surface_get_content(s));
-    cairo_surface_set_user_data(ns, &ci_key, cairo_surface_get_user_data(s, &ci_key), NULL);
+    cairo_surface_set_user_data(ns, &ink_color_interpolation_key, cairo_surface_get_user_data(s, &ink_color_interpolation_key), NULL);
     return ns;
 }
 
@@ -845,13 +928,20 @@ convert_pixels_argb32_to_pixbuf(guchar *data, int w, int h, int stride)
  * using it with GTK will result in corrupted drawings.
  */
 void
-convert_pixbuf_normal_to_argb32(GdkPixbuf *pb)
+ink_pixbuf_ensure_argb32(GdkPixbuf *pb)
 {
+    gchar *pixel_format = reinterpret_cast<gchar*>(g_object_get_data(G_OBJECT(pb), "pixel_format"));
+    if (pixel_format != NULL && strcmp(pixel_format, "argb32") == 0) {
+        // nothing to do
+        return;
+    }
+
     convert_pixels_pixbuf_to_argb32(
         gdk_pixbuf_get_pixels(pb),
         gdk_pixbuf_get_width(pb),
         gdk_pixbuf_get_height(pb),
         gdk_pixbuf_get_rowstride(pb));
+    g_object_set_data_full(G_OBJECT(pb), "pixel_format", g_strdup("argb32"), g_free);
 }
 
 /**
@@ -859,13 +949,20 @@ convert_pixbuf_normal_to_argb32(GdkPixbuf *pb)
  * Once this is done, the pixbuf can be used with GTK again.
  */
 void
-convert_pixbuf_argb32_to_normal(GdkPixbuf *pb)
+ink_pixbuf_ensure_normal(GdkPixbuf *pb)
 {
+    gchar *pixel_format = reinterpret_cast<gchar*>(g_object_get_data(G_OBJECT(pb), "pixel_format"));
+    if (pixel_format == NULL || strcmp(pixel_format, "pixbuf") == 0) {
+        // nothing to do
+        return;
+    }
+
     convert_pixels_argb32_to_pixbuf(
         gdk_pixbuf_get_pixels(pb),
         gdk_pixbuf_get_width(pb),
         gdk_pixbuf_get_height(pb),
         gdk_pixbuf_get_rowstride(pb));
+    g_object_set_data_full(G_OBJECT(pb), "pixel_format", g_strdup("pixbuf"), g_free);
 }
 
 guint32 argb32_from_rgba(guint32 in)
diff --git a/src/display/cairo-utils.h b/src/display/cairo-utils.h
index 016f72d00..289d4e01f 100644
--- a/src/display/cairo-utils.h
+++ b/src/display/cairo-utils.h
@@ -82,6 +82,17 @@ public:
 
 } // namespace Inkscape
 
+enum InkPixelFormat {
+    INK_PIXEL_FORMAT_NONE,
+    INK_PIXEL_FORMAT_CAIRO,
+    INK_PIXEL_FORMAT_PIXBUF,
+    INK_PIXEL_FORMAT_LAST
+};
+
+// TODO: these declarations may not be needed in the header
+extern cairo_user_data_key_t ink_color_interpolation_key;
+extern cairo_user_data_key_t ink_pixbuf_key;
+
 SPColorInterpolation get_cairo_surface_ci(cairo_surface_t *surface);
 void set_cairo_surface_ci(cairo_surface_t *surface, SPColorInterpolation cif);
 void copy_cairo_surface_ci(cairo_surface_t *in, cairo_surface_t *out);
@@ -91,7 +102,7 @@ void ink_cairo_set_source_color(cairo_t *ct, SPColor const &color, double opacit
 void ink_cairo_set_source_rgba32(cairo_t *ct, guint32 rgba);
 void ink_cairo_transform(cairo_t *ct, Geom::Affine const &m);
 void ink_cairo_pattern_set_matrix(cairo_pattern_t *cp, Geom::Affine const &m);
-void ink_cairo_set_source_argb32_pixbuf(cairo_t *ct, GdkPixbuf *pb, double x, double y);
+void ink_cairo_set_source_pixbuf(cairo_t *ct, GdkPixbuf *pb, double x, double y);
 
 void ink_matrix_to_2geom(Geom::Affine &, cairo_matrix_t const &);
 void ink_matrix_to_cairo(cairo_matrix_t &, Geom::Affine const &);
@@ -116,9 +127,10 @@ cairo_pattern_t *ink_cairo_pattern_create_checkerboard();
 
 void convert_pixels_pixbuf_to_argb32(guchar *data, int w, int h, int rs);
 void convert_pixels_argb32_to_pixbuf(guchar *data, int w, int h, int rs);
-void convert_pixbuf_normal_to_argb32(GdkPixbuf *);
-void convert_pixbuf_argb32_to_normal(GdkPixbuf *);
-cairo_surface_t *ink_cairo_surface_create_for_argb32_pixbuf(GdkPixbuf *pb);
+void ink_pixbuf_ensure_argb32(GdkPixbuf *);
+void ink_pixbuf_ensure_normal(GdkPixbuf *);
+cairo_surface_t *ink_cairo_surface_get_for_pixbuf(GdkPixbuf *pb);
+GdkPixbuf *ink_pixbuf_create_from_cairo_surface(cairo_surface_t *s);
 void ink_cairo_pixbuf_cleanup(guchar *pixels, void *surface);
 
 G_GNUC_CONST guint32 argb32_from_pixbuf(guint32 in);
diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp
index bdb7c15b0..b94d48774 100644
--- a/src/display/drawing-image.cpp
+++ b/src/display/drawing-image.cpp
@@ -22,7 +22,7 @@ namespace Inkscape {
 DrawingImage::DrawingImage(Drawing &drawing)
     : DrawingItem(drawing)
     , _pixbuf(NULL)
-    , _surface(NULL)
+    , _surface(NULL) // this is owned by _pixbuf!
     , _style(NULL)
     , _new_surface(NULL)
 {}
@@ -33,7 +33,6 @@ DrawingImage::~DrawingImage()
         sp_style_unref(_style);
     if (_pixbuf) {
         if (_new_surface) cairo_surface_destroy(_new_surface);
-        cairo_surface_destroy(_surface);
         g_object_unref(_pixbuf);
     }
 }
@@ -50,7 +49,7 @@ DrawingImage::setARGB32Pixbuf(GdkPixbuf *pb)
         cairo_surface_destroy(_surface);
     }
     _pixbuf = pb;
-    _surface = pb ? ink_cairo_surface_create_for_argb32_pixbuf(pb) : NULL;
+    _surface = pb ? ink_cairo_surface_get_for_pixbuf(pb) : NULL;
 
     _markForUpdate(STATE_ALL, false);
 }
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index 7a27d857e..8b307ac00 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -30,7 +30,6 @@ FilterImage::FilterImage()
     : SVGElem(0)
     , document(0)
     , feImageHref(0)
-    , image_surface(0)
     , broken_ref(false)
 { }
 
@@ -172,18 +171,10 @@ void FilterImage::render_cairo(FilterSlot &slot)
         if (!has_alpha) {
             image = image->add_alpha(false, 0, 0, 0);
         }
-
-        // Native size of image
-        // width = image->get_width();
-        // height = image->get_height();
-        // rowstride = image->get_rowstride();
-
-        convert_pixbuf_normal_to_argb32(image->gobj());
-
-        image_surface = cairo_image_surface_create_for_data(image->get_pixels(),
-            CAIRO_FORMAT_ARGB32, image->get_width(), image->get_height(), image->get_rowstride());
     }
 
+    cairo_surface_t *image_surface = ink_cairo_surface_get_for_pixbuf(image->gobj());
+
     Geom::Rect sa = slot.get_slot_area();
     cairo_surface_t *out = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
         sa.width(), sa.height());
@@ -310,9 +301,6 @@ void FilterImage::set_href(const gchar *href){
     if (feImageHref) g_free (feImageHref);
     feImageHref = (href) ? g_strdup (href) : NULL;
 
-    if (image_surface) {
-        cairo_surface_destroy(image_surface);
-    }
     image.reset();
     broken_ref = false;
 }
diff --git a/src/display/nr-filter-image.h b/src/display/nr-filter-image.h
index 05b7d65a8..f45f42265 100644
--- a/src/display/nr-filter-image.h
+++ b/src/display/nr-filter-image.h
@@ -44,7 +44,6 @@ private:
     SPDocument *document;
     gchar *feImageHref;
     Glib::RefPtr<Gdk::Pixbuf> image;
-    cairo_surface_t *image_surface;
     float feImageX, feImageY, feImageWidth, feImageHeight;
     unsigned int aspect_align, aspect_clip;
     bool broken_ref;
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 3c222bd9e..a950fa177 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -1306,7 +1306,7 @@ CairoRenderContext::_setStrokeStyle(SPStyle const *style, Geom::OptRect const &p
     {
         cairo_set_dash(_cr, style->stroke_dash.dash, style->stroke_dash.n_dash, style->stroke_dash.offset);
     } else {
-    	cairo_set_dash(_cr, NULL, 0, 0.0);	// disable dashing
+        cairo_set_dash(_cr, NULL, 0, 0.0);  // disable dashing
     }
 
     cairo_set_line_width(_cr, style->stroke_width.computed);
@@ -1314,30 +1314,30 @@ CairoRenderContext::_setStrokeStyle(SPStyle const *style, Geom::OptRect const &p
     // set line join type
     cairo_line_join_t join = CAIRO_LINE_JOIN_MITER;
     switch (style->stroke_linejoin.computed) {
-    	case SP_STROKE_LINEJOIN_MITER:
-    	    join = CAIRO_LINE_JOIN_MITER;
-    	    break;
-    	case SP_STROKE_LINEJOIN_ROUND:
-    	    join = CAIRO_LINE_JOIN_ROUND;
-    	    break;
-    	case SP_STROKE_LINEJOIN_BEVEL:
-    	    join = CAIRO_LINE_JOIN_BEVEL;
-    	    break;
+        case SP_STROKE_LINEJOIN_MITER:
+            join = CAIRO_LINE_JOIN_MITER;
+            break;
+        case SP_STROKE_LINEJOIN_ROUND:
+            join = CAIRO_LINE_JOIN_ROUND;
+            break;
+        case SP_STROKE_LINEJOIN_BEVEL:
+            join = CAIRO_LINE_JOIN_BEVEL;
+            break;
     }
     cairo_set_line_join(_cr, join);
 
     // set line cap type
     cairo_line_cap_t cap = CAIRO_LINE_CAP_BUTT;
     switch (style->stroke_linecap.computed) {
-    	case SP_STROKE_LINECAP_BUTT:
-    	    cap = CAIRO_LINE_CAP_BUTT;
-    	    break;
-    	case SP_STROKE_LINECAP_ROUND:
-    	    cap = CAIRO_LINE_CAP_ROUND;
-    	    break;
-    	case SP_STROKE_LINECAP_SQUARE:
-    	    cap = CAIRO_LINE_CAP_SQUARE;
-    	    break;
+        case SP_STROKE_LINECAP_BUTT:
+            cap = CAIRO_LINE_CAP_BUTT;
+            break;
+        case SP_STROKE_LINECAP_ROUND:
+            cap = CAIRO_LINE_CAP_ROUND;
+            break;
+        case SP_STROKE_LINECAP_SQUARE:
+            cap = CAIRO_LINE_CAP_SQUARE;
+            break;
     }
     cairo_set_line_cap(_cr, cap);
     cairo_set_miter_limit(_cr, MAX(1, style->stroke_miterlimit.value));
@@ -1453,10 +1453,10 @@ bool CairoRenderContext::renderImage(GdkPixbuf *pb,
     // TODO: reenable merge_opacity if useful
     float opacity = _state->opacity;
 
-    cairo_surface_t *image_surface = ink_cairo_surface_create_for_argb32_pixbuf(pb);
+    cairo_surface_t *image_surface = ink_cairo_surface_get_for_pixbuf(pb);
     if (cairo_surface_status(image_surface)) {
         TRACE(("Image surface creation failed:\n%s\n", cairo_status_to_string(cairo_surface_status(image_surface))));
-    	return false;
+        return false;
     }
 
     cairo_save(_cr);
@@ -1475,7 +1475,6 @@ bool CairoRenderContext::renderImage(GdkPixbuf *pb,
     cairo_paint_with_alpha(_cr, opacity);
 
     cairo_restore(_cr);
-    cairo_surface_destroy(image_surface);
     return true;
 }
 
@@ -1676,9 +1675,9 @@ _write_callback(void *closure, const unsigned char *data, unsigned int length)
     written = fwrite (data, 1, length, file);
 
     if (written == length)
-	return CAIRO_STATUS_SUCCESS;
+    return CAIRO_STATUS_SUCCESS;
     else
-	return CAIRO_STATUS_WRITE_ERROR;
+    return CAIRO_STATUS_WRITE_ERROR;
 }
 
 #include "clear-n_.h"
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 76ebbfcb5..3463925b6 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -449,7 +449,7 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx)
     Geom::OptRect bbox = item->desktopVisualBounds();
 
     // no bbox, e.g. empty group
-	if (!bbox) {
+    if (!bbox) {
         return;
     }
 
@@ -503,8 +503,13 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx)
 
     if (pb) {
         TEST(gdk_pixbuf_save( pb, "bitmap.png", "png", NULL, NULL ));
-        // TODO this is stupid - we just converted to pixbuf format when generating the bitmap!
-        convert_pixbuf_normal_to_argb32(pb);
+
+        /* TODO: find a way to avoid a duplicate conversion between
+         * Cairo and GdkPixbuf pixel formats here.
+         * Internally, generate_internal_bitmap creates a Cairo surface,
+         * but then converts it to pixbuf format. In turn, renderImage()
+         * below converts back to Cairo format.
+         */
         ctx->renderImage(pb, t, item->style);
         g_object_unref(pb);
         pb = 0;
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index 75c002c57..a51a62f42 100644
--- a/src/helper/pixbuf-ops.cpp
+++ b/src/helper/pixbuf-ops.cpp
@@ -146,12 +146,7 @@ GdkPixbuf *sp_generate_internal_bitmap(SPDocument *doc, gchar const */*filename*
         // render items
         drawing.render(ct, final_bbox, Inkscape::DrawingItem::RENDER_BYPASS_CACHE);
 
-        pixbuf = gdk_pixbuf_new_from_data(cairo_image_surface_get_data(surface),
-                                          GDK_COLORSPACE_RGB, TRUE,
-                                          8, width, height, cairo_image_surface_get_stride(surface),
-                                          ink_cairo_pixbuf_cleanup,
-                                          surface);
-        convert_pixbuf_argb32_to_normal(pixbuf);
+        pixbuf = ink_pixbuf_create_from_cairo_surface(surface);
     }
     else
     {
diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index 10d294d5c..a082e2802 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -57,15 +57,13 @@
 
 //#define DEBUG_LCMS
 #ifdef DEBUG_LCMS
-
-
 #define DEBUG_MESSAGE(key, ...)\
 {\
     g_message( __VA_ARGS__ );\
 }
-
-
 #include <gtk/gtk.h>
+#else
+#define DEBUG_MESSAGE(key, ...)
 #endif // DEBUG_LCMS
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 /*
@@ -133,6 +131,8 @@ extern guint update_in_progress;
         gtk_widget_show_all( dialog );\
     }\
 }
+#else // DEBUG_LCMS
+#define DEBUG_MESSAGE_SCISLAC(key, ...)
 #endif // DEBUG_LCMS
 
 namespace Inkscape {
@@ -715,23 +715,25 @@ static void sp_image_set( SPObject *object, unsigned int key, const gchar *value
                 image->aspect_clip = clip;
             }
             break;
+
 #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
         case SP_PROP_COLOR_PROFILE:
             if ( image->color_profile ) {
                 g_free (image->color_profile);
             }
             image->color_profile = (value) ? g_strdup (value) : NULL;
-#ifdef DEBUG_LCMS
+
             if ( value ) {
                 DEBUG_MESSAGE( lcmsFour, "<image> color-profile set to '%s'", value );
             } else {
                 DEBUG_MESSAGE( lcmsFour, "<image> color-profile cleared" );
             }
-#endif // DEBUG_LCMS
+
             // TODO check on this HREF_MODIFIED flag
             object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_IMAGE_HREF_MODIFIED_FLAG);
             break;
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
+
         default:
             if (((SPObjectClass *) (sp_image_parent_class))->set)
                 ((SPObjectClass *) (sp_image_parent_class))->set (object, key, value);
@@ -784,9 +786,8 @@ static void sp_image_update( SPObject *object, SPCtx *ctx, unsigned int flags )
                     guchar* px = gdk_pixbuf_get_pixels( pixbuf );
 
                     if ( px ) {
-#ifdef DEBUG_LCMS
                         DEBUG_MESSAGE( lcmsFive, "in <image>'s sp_image_update. About to call colorprofile_get_handle()" );
-#endif // DEBUG_LCMS
+
                         guint profIntent = Inkscape::RENDERING_INTENT_UNKNOWN;
                         cmsHPROFILE prof = Inkscape::CMSSystem::getHandle( object->document,
                                                                            &profIntent,
@@ -826,34 +827,24 @@ static void sp_image_update( SPObject *object, SPCtx *ctx, unsigned int flags )
                                     }
 
                                     cmsDeleteTransform( transf );
-                                }
-#ifdef DEBUG_LCMS
-                                else
-                                {
+                                } else {
                                     DEBUG_MESSAGE( lcmsSix, "in <image>'s sp_image_update. Unable to create LCMS transform." );
                                 }
-#endif // DEBUG_LCMS
+
                                 cmsCloseProfile( destProf );
-                            }
-#ifdef DEBUG_LCMS
-                            else
-                            {
+                            } else {
                                 DEBUG_MESSAGE( lcmsSeven, "in <image>'s sp_image_update. Profile type is named color. Can't transform." );
                             }
-#endif // DEBUG_LCMS
-                        }
-#ifdef DEBUG_LCMS
-                        else
-                        {
+                        } else {
                             DEBUG_MESSAGE( lcmsEight, "in <image>'s sp_image_update. No profile found." );
                         }
-#endif // DEBUG_LCMS
                     }
                 }
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
+
                 image->pixbuf = pixbuf;
-                // convert to premultiplied native-endian ARGB for display with Cairo
-                convert_pixbuf_normal_to_argb32(image->pixbuf);
+                // used here for the side-effect of converting to ARGB32
+                ink_cairo_surface_get_for_pixbuf(image->pixbuf);
             }
         }
     }
@@ -1018,7 +1009,9 @@ static void sp_image_print( SPItem *item, SPPrintContext *ctx )
 
     if (image->pixbuf && (image->width.computed > 0.0) && (image->height.computed > 0.0) ) {
         GdkPixbuf *pb = gdk_pixbuf_copy(image->pixbuf);
-        convert_pixbuf_argb32_to_normal(pb);
+        // GObject data is not copied, so we have to set the pixel format explicitly
+        g_object_set_data_full(G_OBJECT(pb), "pixel_format", g_strdup("argb32"), g_free);
+        ink_pixbuf_ensure_normal(pb);
 
         guchar *px = gdk_pixbuf_get_pixels(pb);
         int w = gdk_pixbuf_get_width(pb);
@@ -1056,7 +1049,7 @@ static void sp_image_print( SPItem *item, SPPrintContext *ctx )
             t = ti * t;
             sp_print_image_R8G8B8A8_N(ctx, px + trimx*pixskip + trimy*rs, trimwidth, trimheight, rs, t, item->style);
         }
-        free(px);  // else big memory leak on each image print!
+        g_object_unref(pb);
     }
 }
 
diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index 74e94b827..a09489f6d 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -33,7 +33,7 @@
 
 #include "ui/cache/svg_preview_cache.h"
 
-GdkPixbuf* render_pixbuf(Inkscape::Drawing &drawing, double scale_factor, const Geom::Rect& dbox, unsigned psize)
+GdkPixbuf* render_pixbuf(Inkscape::Drawing &drawing, double scale_factor, Geom::Rect const &dbox, unsigned psize)
 {
     Geom::Affine t(Geom::Scale(scale_factor, scale_factor));
     drawing.root()->setTransform(Geom::Scale(scale_factor));
@@ -61,13 +61,7 @@ GdkPixbuf* render_pixbuf(Inkscape::Drawing &drawing, double scale_factor, const
     drawing.render(ct, area, Inkscape::DrawingItem::RENDER_BYPASS_CACHE);
     cairo_surface_flush(s);
 
-    GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data(cairo_image_surface_get_data(s),
-                                      GDK_COLORSPACE_RGB,
-                                      TRUE,
-                                      8, psize, psize, cairo_image_surface_get_stride(s),
-                                      ink_cairo_pixbuf_cleanup, s);
-    convert_pixbuf_argb32_to_normal(pixbuf);
-
+    GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s);
     return pixbuf;
 }
 
@@ -81,6 +75,12 @@ SvgPreview::SvgPreview()
 
 SvgPreview::~SvgPreview()
 {
+    for (std::map<Glib::ustring, GdkPixbuf *>::iterator i = _pixmap_cache.begin();
+         i != _pixmap_cache.end(); ++i)
+    {
+        g_object_unref(i->second);
+        i->second = NULL;
+    }
 }
 
 Glib::ustring SvgPreview::cache_key(gchar const *uri, gchar const *name, unsigned psize) const {
@@ -102,6 +102,7 @@ GdkPixbuf* SvgPreview::get_preview_from_cache(const Glib::ustring& key) {
 }
 
 void SvgPreview::set_preview_in_cache(const Glib::ustring& key, GdkPixbuf* px) {
+    g_object_ref(px);
     _pixmap_cache[key] = px;
 }
 
@@ -123,6 +124,8 @@ GdkPixbuf* SvgPreview::get_preview(const gchar* uri, const gchar* id, Inkscape::
 void SvgPreview::remove_preview_from_cache(const Glib::ustring& key) {
     std::map<Glib::ustring, GdkPixbuf *>::iterator found = _pixmap_cache.find(key);
     if ( found != _pixmap_cache.end() ) {
+        g_object_unref(found->second);
+        found->second = NULL;
         _pixmap_cache.erase(key);
     }
 }
diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index 2292b66fc..7940c28ae 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -235,11 +235,7 @@ static void colorItemDragBegin( GtkWidget */*widget*/, GdkDragContext* dc, gpoin
                 cairo_pattern_destroy(gradient);
                 cairo_surface_flush(s);
 
-                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);
+                pixbuf = ink_pixbuf_create_from_cairo_surface(s);
             } else {
                 Glib::RefPtr<Gdk::Pixbuf> thumb = Gdk::Pixbuf::create( Gdk::COLORSPACE_RGB, false, 8, width, height );
                 guint32 fillWith = (0xff000000 & (item->def.getR() << 24))
@@ -561,11 +557,7 @@ void ColorItem::_regenPreview(EekPreview * preview)
         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,
-                                                      w, h, cairo_image_surface_get_stride(s),
-                                                      ink_cairo_pixbuf_cleanup, s);
-        convert_pixbuf_argb32_to_normal(pixbuf);
+        GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s);
         eek_preview_set_pixbuf( preview, pixbuf );
     }
 
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 26bc52947..6427eb9cc 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -420,12 +420,12 @@ void SymbolsDialog::iconChanged() {
     // First look for default style stored in <symbol>
     gchar const* style = symbol->getAttribute("inkscape:symbol-style");
     if( !style ) {
-	  // If no default style in <symbol>, look in documents.
-	  if( symbolDocument == currentDocument ) {
-	    style = style_from_use( symbol_id.c_str(), currentDocument );
-	  } else {
-	    style = symbolDocument->getReprRoot()->attribute("style");
-	  }
+    // If no default style in <symbol>, look in documents.
+    if( symbolDocument == currentDocument ) {
+      style = style_from_use( symbol_id.c_str(), currentDocument );
+    } else {
+      style = symbolDocument->getReprRoot()->attribute("style");
+    }
     }
 
     ClipboardManager *cm = ClipboardManager::get();
@@ -489,8 +489,8 @@ SPDocument* read_vss( gchar* fullname, gchar* filename ) {
     while( std::getline( iss, line ) ) {
       // std::cout << line << std::endl;
       if( line.find( "svg:svg" ) == std::string::npos ) {
-	tmpSVGOutput += line;
-	tmpSVGOutput += "\n";
+  tmpSVGOutput += line;
+  tmpSVGOutput += "\n";
       }
     }
 
@@ -499,23 +499,23 @@ SPDocument* read_vss( gchar* fullname, gchar* filename ) {
 
   tmpSVGOutput += "  </defs>\n";
   tmpSVGOutput += "</svg>\n";
-	      
+        
   return SPDocument::createNewDocFromMem( tmpSVGOutput.c_str(), strlen( tmpSVGOutput.c_str()), 0 );
 
 }
 #endif
-											  
+                        
 /* Hunts preference directories for symbol files */
 void SymbolsDialog::get_symbols() {
 
   std::list<Glib::ustring> directories;
 
   if( Inkscape::IO::file_test( INKSCAPE_SYMBOLSDIR, G_FILE_TEST_EXISTS ) &&
-	Inkscape::IO::file_test( INKSCAPE_SYMBOLSDIR, G_FILE_TEST_IS_DIR ) ) {
+  Inkscape::IO::file_test( INKSCAPE_SYMBOLSDIR, G_FILE_TEST_IS_DIR ) ) {
     directories.push_back( INKSCAPE_SYMBOLSDIR );
   }
   if( Inkscape::IO::file_test( profile_path("symbols"), G_FILE_TEST_EXISTS ) &&
-	Inkscape::IO::file_test( profile_path("symbols"), G_FILE_TEST_IS_DIR ) ) {
+  Inkscape::IO::file_test( profile_path("symbols"), G_FILE_TEST_IS_DIR ) ) {
     directories.push_back( profile_path("symbols") );
   }
 
@@ -526,46 +526,46 @@ void SymbolsDialog::get_symbols() {
     GDir *dir = g_dir_open( (*it).c_str(), 0, &err );
     if( dir ) {
 
-	gchar *filename = 0;
-	while( (filename = (gchar *)g_dir_read_name( dir ) ) != NULL) {
+  gchar *filename = 0;
+  while( (filename = (gchar *)g_dir_read_name( dir ) ) != NULL) {
 
-	  gchar *fullname = g_build_filename((*it).c_str(), filename, NULL);
+    gchar *fullname = g_build_filename((*it).c_str(), filename, NULL);
 
-	  if ( !Inkscape::IO::file_test( fullname, G_FILE_TEST_IS_DIR ) ) {
+    if ( !Inkscape::IO::file_test( fullname, G_FILE_TEST_IS_DIR ) ) {
 
-	    Glib::ustring fn( filename );
-	    Glib::ustring tag = fn.substr( fn.find_last_of(".") + 1 );
+      Glib::ustring fn( filename );
+      Glib::ustring tag = fn.substr( fn.find_last_of(".") + 1 );
 
-	    SPDocument* symbol_doc = NULL;
+      SPDocument* symbol_doc = NULL;
 
 #ifdef WITH_LIBVISIO
-	    if( tag.compare( "vss" ) == 0 ) {
-
-	      symbol_doc = read_vss( fullname, filename );
-	      if( symbol_doc ) {
-		symbolSets[Glib::ustring(filename)]= symbol_doc;
-		symbolSet->append(filename);
-	      }
-	    }
+      if( tag.compare( "vss" ) == 0 ) {
+
+        symbol_doc = read_vss( fullname, filename );
+        if( symbol_doc ) {
+    symbolSets[Glib::ustring(filename)]= symbol_doc;
+    symbolSet->append(filename);
+        }
+      }
 #endif
-	    // Try to read all remaining files as SVG
-	    if( !symbol_doc ) {
+      // Try to read all remaining files as SVG
+      if( !symbol_doc ) {
 
-	      symbol_doc = SPDocument::createNewDoc( fullname, FALSE );
-	      if( symbol_doc ) {
+        symbol_doc = SPDocument::createNewDoc( fullname, FALSE );
+        if( symbol_doc ) {
               gchar *title = symbol_doc->getRoot()->title();
               if( title == NULL ) {
                   title = _("Unnamed Symbols");
               }
-		      symbolSets[Glib::ustring(title)] = symbol_doc;
-		      symbolSet->append(title);
-	      }
-	    }
-
-	  }
-	  g_free( fullname );
-	}
-	g_dir_close( dir );
+          symbolSets[Glib::ustring(title)] = symbol_doc;
+          symbolSet->append(title);
+        }
+      }
+
+    }
+    g_free( fullname );
+  }
+  g_dir_close( dir );
     }
   }
 }
@@ -627,16 +627,16 @@ gchar const* SymbolsDialog::style_from_use( gchar const* id, SPDocument* documen
   for( ; l != NULL; l = l->next ) {
     SPObject* use = SP_OBJECT(l->data);
     if( SP_IS_USE( use ) ) {
-	gchar const *href = use->getRepr()->attribute("xlink:href");
-	if( href ) {
-	  Glib::ustring href2(href);
-	  Glib::ustring id2(id);
-	  id2 = "#" + id2;
-	  if( !href2.compare(id2) ) {
-	    style = use->getRepr()->attribute("style");
-	    break;
-	  }
-	}
+  gchar const *href = use->getRepr()->attribute("xlink:href");
+  if( href ) {
+    Glib::ustring href2(href);
+    Glib::ustring id2(id);
+    id2 = "#" + id2;
+    if( !href2.compare(id2) ) {
+      style = use->getRepr()->attribute("style");
+      break;
+    }
+  }
     }
   }
   return style;
@@ -749,9 +749,13 @@ SymbolsDialog::create_symbol_image(gchar const *symbol_id, SPObject *symbol)
   /* Update to renderable state */
   Glib::ustring key = svg_preview_cache.cache_key(previewDocument->getURI(), symbol_id, psize);
   //std::cout << "  Key: " << key << std::endl;
-  // FIX ME
-  //Glib::RefPtr<Gdk::Pixbuf> pixbuf = Glib::wrap(svg_preview_cache.get_preview_from_cache(key));
-  Glib::RefPtr<Gdk::Pixbuf> pixbuf = Glib::RefPtr<Gdk::Pixbuf>(0);
+
+  Glib::RefPtr<Gdk::Pixbuf> pixbuf(NULL);
+  GdkPixbuf *pixbuf_gobj = svg_preview_cache.get_preview_from_cache(key);
+  if (pixbuf_gobj) {
+    g_object_ref(pixbuf_gobj); // the reference in svg_preview_cache will get destroyed when it's freed
+    pixbuf = Glib::wrap(pixbuf_gobj);
+  }
 
   // Find object's bbox in document.
   // Note symbols can have own viewport... ignore for now.
@@ -776,8 +780,8 @@ SymbolsDialog::create_symbol_image(gchar const *symbol_id, SPObject *symbol)
     }
 
     if( fitSymbol->get_active() ) {
-	  /* Fit */
-	  scale = psize/std::max(width,height);
+    /* Fit */
+    scale = psize/std::max(width,height);
     }
 
     pixbuf = Glib::wrap(render_pixbuf(renderDrawing, scale, *dbox, psize));
@@ -814,8 +818,8 @@ void SymbolsDialog::setTargetDesktop(SPDesktop *desktop)
   if (this->currentDesktop != desktop) {
     this->currentDesktop = desktop;
     if( !symbolSets[symbolSet->get_active_text()] ) {
-	// Symbol set is from Current document, update
-	rebuild();
+  // Symbol set is from Current document, update
+  rebuild();
     }
   }
 }
diff --git a/src/ui/widget/color-preview.cpp b/src/ui/widget/color-preview.cpp
index 4b4a7b738..5bcd16528 100644
--- a/src/ui/widget/color-preview.cpp
+++ b/src/ui/widget/color-preview.cpp
@@ -73,9 +73,9 @@ ColorPreview::on_expose_event (GdkEventExpose *event)
     if (get_is_drawable())
     {
         Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context();
-	cr->rectangle(event->area.x, event->area.y,
+    cr->rectangle(event->area.x, event->area.y,
                       event->area.width, event->area.height);
-	cr->clip();
+    cr->clip();
         result = on_draw(cr);
     }
 
@@ -176,12 +176,7 @@ ColorPreview::toPixbuf (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);
-
+    GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s);
     return pixbuf;
 }
 
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;
 }