diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-04-29 18:38:18 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-04-29 18:38:18 +0000 |
| commit | 44c7ba14b05043f1756240b8fa90abb72de0426e (patch) | |
| tree | 73ecd97f9b63049f7490c8ae755ac79f92d922e8 | |
| parent | f164053f95108b8dff6a5549d93bc0efeb40b270 (diff) | |
| download | gdk-pixbuf-44c7ba14b05043f1756240b8fa90abb72de0426e.tar.gz | |
Remove a pointless check from the previous commit that added a new string.
2007-04-29 Matthias Clasen <mclasen@redhat.com>
* io-jpeg.c: Remove a pointless check from the previous
commit that added a new string.
svn path=/branches/gtk-2-10/; revision=17713
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/io-jpeg.c | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index aa3558e89..2d6ca4ff1 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2007-04-29 Matthias Clasen <mclasen@redhat.com> + + * io-jpeg.c: Remove a pointless check from the previous + commit that added a new string. + 2007-04-28 Matthias Clasen <mclasen@redhat.com> Merge from trunk: diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c index 4d1c354f8..ba3fd94d2 100644 --- a/gdk-pixbuf/io-jpeg.c +++ b/gdk-pixbuf/io-jpeg.c @@ -964,18 +964,8 @@ real_save_jpeg (GdkPixbuf *pixbuf, w = gdk_pixbuf_get_width (pixbuf); h = gdk_pixbuf_get_height (pixbuf); - - /* no image data? abort */ pixels = gdk_pixbuf_get_pixels (pixbuf); - if (pixels == NULL) { - g_set_error (error, - GDK_PIXBUF_ERROR, - GDK_PIXBUF_ERROR_CORRUPT_IMAGE, - _("Image contains no pixels.")); - return FALSE; - } - /* Allocate a small buffer to convert image data, * and a larger buffer if doing to_callback save. */ |