summaryrefslogtreecommitdiffstats
path: root/src/helper/pixbuf-ops.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-09-17 16:57:02 +0000
committerJabiertxof <jtx@jtx.marker.es>2013-09-17 16:57:02 +0000
commit909d0457495fa1d5f3cfe7065fd68d4021c0d291 (patch)
tree33cb19d99eafde178bcc0b08316fba1568ed5fb7 /src/helper/pixbuf-ops.cpp
parentupdate to trunk (diff)
parentFix for Bug #1217602 (Measure Path fails with XML too deep error) by dave m. (diff)
downloadinkscape-909d0457495fa1d5f3cfe7065fd68d4021c0d291.tar.gz
inkscape-909d0457495fa1d5f3cfe7065fd68d4021c0d291.zip
Update to trunk
(bzr r11950.1.140)
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 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
{