Merge tag 'upstream/0.5.5'

Upstream version 0.5.5

1 files changed, 7 insertions, 3 deletions

diff --git a/src/images/image.vala b/src/images/image.vala
index 1d9674b..197523b 100644
--- a/src/images/image.vala
+++ b/src/images/image.vala
@@ -134,6 +134,7 @@ public class Image : GLib.Object {
                 warning("Failed to load " + filename + "!");
                 this.surface = new Cairo.ImageSurface(Cairo.Format.ARGB32, width, height);
             }
+            
         } catch (GLib.Error e) {
             message("Error loading image file: %s", e.message);
             this.surface = new Cairo.ImageSurface(Cairo.Format.ARGB32, width, height);
@@ -167,8 +168,11 @@ public class Image : GLib.Object {
     /////////////////////////////////////////////////////////////////////
     
     public Gdk.Pixbuf to_pixbuf() {
-        var pixbuf = new Gdk.Pixbuf.from_data(surface.get_data(), Gdk.Colorspace.RGB, true, 8, 
-                                              width(), height(), surface.get_stride(), null);
+        if (this.surface == null || this.surface.get_data().length <= 0)
+            return new Gdk.Pixbuf(Gdk.Colorspace.RGB, true, 8, 1, 1);
+        
+        var pixbuf = new Gdk.Pixbuf.from_data(this.surface.get_data(), Gdk.Colorspace.RGB, true, 8, 
+                                              width(), height(), this.surface.get_stride(), null);
         
         pixbuf = pixbuf.copy();
                                        
@@ -180,7 +184,7 @@ public class Image : GLib.Object {
             *(p + i) = *(p + i + 2);
             *(p + i + 2) = tmp;
         }
-		
+
 		return pixbuf;
     }