summaryrefslogtreecommitdiffstats
path: root/src/helper/pixbuf-ops.cpp
diff options
context:
space:
mode:
authorMatthew Petroff <matthew@mpetroff.net>2013-09-15 19:26:40 +0000
committerMatthew Petroff <matthew@mpetroff.net>2013-09-15 19:26:40 +0000
commitd0f046b0aff8b4404c852990886f9afeca6d5c0f (patch)
tree9f03e5af0f2126a7d9cd7a7d11d61b5b99e16a3a /src/helper/pixbuf-ops.cpp
parentFix document unit change for disconnected connectors. (diff)
parentDutch translation update (diff)
downloadinkscape-d0f046b0aff8b4404c852990886f9afeca6d5c0f.tar.gz
inkscape-d0f046b0aff8b4404c852990886f9afeca6d5c0f.zip
Merge from trunk.
(bzr r12475.1.20)
Diffstat (limited to 'src/helper/pixbuf-ops.cpp')
-rw-r--r--src/helper/pixbuf-ops.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/helper/pixbuf-ops.cpp b/src/helper/pixbuf-ops.cpp
index a53da5bba..6a8897b71 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
{