Merge from trunk.

(bzr r12475.1.20)

1 files changed, 8 insertions, 3 deletions

diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 3ffd6b2ed..ac2fe5ba3 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;