mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-10 10:50:10 +00:00
gdk-pixbuf-loader.c (gdk_pixbuf_loader_close): Propagate
errors from gdk_pixbuf_loader_load_module.
This commit is contained in:
parent
29c0d6fa32
commit
5021904329
@ -1,3 +1,8 @@
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user