diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index d8e03e22da..94dae61581 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2007-07-06 Michael J. Chudobiak + + * io-tiff.c: (tiff_image_parse): Added a comment to explain + the signal used to stop parsing early. + 2007-07-05 Matthias Clasen * io-tiff.c: Revert the last change, it was wrong diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c index a9863e6cff..215c130b38 100644 --- a/gdk-pixbuf/io-tiff.c +++ b/gdk-pixbuf/io-tiff.c @@ -199,6 +199,11 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error) gint h = height; (* context->size_func) (&w, &h, context->user_data); + /* This is a signal that this function is being called + to support gdk_pixbuf_get_file_info, so we can stop + parsing the tiff file at this point. It is not an + error condition. */ + if (w == 0 || h == 0) return NULL; }