summaryrefslogtreecommitdiffstats
path: root/src/display/cairo-utils.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-10-13 18:20:26 +0000
committerJabiertxof <jtx@jtx.marker.es>2013-10-13 18:20:26 +0000
commit8e30821fa53134256a47dc977e607b1949eeec33 (patch)
treed51ef233932502ef56d563ac8497483878691628 /src/display/cairo-utils.cpp
parentUpdate to trunk (diff)
parentwe don't have nondocked dialogs, so rewrite restoring dialogs on startup via ... (diff)
downloadinkscape-8e30821fa53134256a47dc977e607b1949eeec33.tar.gz
inkscape-8e30821fa53134256a47dc977e607b1949eeec33.zip
Update to trunk
(bzr r11950.1.181)
Diffstat (limited to 'src/display/cairo-utils.cpp')
-rw-r--r--src/display/cairo-utils.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index 451f0b509..5b358ade7 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -254,7 +254,6 @@ Pixbuf *Pixbuf::create_from_data_uri(gchar const *uri_data)
}
if ((*data) && data_is_image && data_is_base64) {
- GdkPixbuf *buf = NULL;
GdkPixbufLoader *loader = gdk_pixbuf_loader_new();
if (!loader) return NULL;
@@ -264,7 +263,7 @@ Pixbuf *Pixbuf::create_from_data_uri(gchar const *uri_data)
if (gdk_pixbuf_loader_write(loader, decoded, decoded_len, NULL)) {
gdk_pixbuf_loader_close(loader, NULL);
- buf = gdk_pixbuf_loader_get_pixbuf(loader);
+ GdkPixbuf *buf = gdk_pixbuf_loader_get_pixbuf(loader);
if (buf) {
g_object_ref(buf);
pixbuf = new Pixbuf(buf);