Commit 50219043 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Propagate

errors from gdk_pixbuf_loader_load_module.
parent 29c0d6fa
Thu Aug 30 08:30:03 2001 Matthias Clasen <matthiasc@poet.de>
* gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Propagate
errors from gdk_pixbuf_loader_load_module.
Thu Aug 30 08:27:37 2001 Matthias Clasen <matthiasc@poet.de>
* io-png.c (png_row_callback): Check that row_num is valid.
......
......@@ -529,9 +529,16 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
/* We have less the 128 bytes in the image. Flush it, and keep going. */
if (priv->image_module == NULL)
gdk_pixbuf_loader_load_module (loader, NULL, NULL);
if (priv->image_module && priv->image_module->stop_load && priv->context)
{
GError *tmp = NULL;
gdk_pixbuf_loader_load_module (loader, NULL, &tmp);
if (tmp != NULL)
{
g_propagate_error (error, tmp);
retval = FALSE;
}
}
if (retval && priv->image_module && priv->image_module->stop_load && priv->context)
retval = priv->image_module->stop_load (priv->context, error);
priv->closed = TRUE;
......@@ -540,3 +547,5 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
return retval;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment