Imported Upstream version 0.6.0upstream/0.6.0

1 files changed, 19 insertions, 19 deletions

diff --git a/src/images/image.vala b/src/images/image.vala
index e65e34a..a903493 100644
--- a/src/images/image.vala
+++ b/src/images/image.vala
@@ -1,19 +1,19 @@
-/*
-Copyright (c) 2011 by Simon Schneegans
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation, either version 3 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2011-2015 by Simon Schneegans
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or (at
+// your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////
 
 namespace GnomePie {
 
@@ -163,10 +163,10 @@ public class Image : GLib.Object {
     /////////////////////////////////////////////////////////////////////
 
     public Gdk.Pixbuf to_pixbuf() {
-        if (this.surface == null || this.surface.get_data().length <= 0)
+        if (this.surface == null || this.surface.get_data() == null)
             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,
+        var pixbuf = new Gdk.Pixbuf.with_unowned_data(this.surface.get_data(), Gdk.Colorspace.RGB, true, 8,
                                               width(), height(), this.surface.get_stride(), null);
 
         pixbuf = pixbuf.copy();
@@ -180,7 +180,7 @@ public class Image : GLib.Object {
             *(p + i + 2) = tmp;
         }
 
-		return pixbuf;
+        return pixbuf;
     }
 
     /////////////////////////////////////////////////////////////////////