AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
errors from gdk_pixbuf_loader_load_module.
This commit is contained in:
Matthias Clasen 2001-08-30 07:23:32 +00:00
parent 29c0d6fa32
commit 5021904329
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdk-pixbuf/ChangeLog
View File

@ -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> Thu Aug 30 08:27:37 2001 Matthias Clasen <matthiasc@poet.de>
* io-png.c (png_row_callback): Check that row_num is valid. * io-png.c (png_row_callback): Check that row_num is valid.

15
gdk-pixbuf/gdk-pixbuf-loader.c
View File

@ -529,9 +529,16 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
/* We have less the 128 bytes in the image. Flush it, and keep going. */ /* We have less the 128 bytes in the image. Flush it, and keep going. */
if (priv->image_module == NULL) if (priv->image_module == NULL)
gdk_pixbuf_loader_load_module (loader, NULL, NULL); {
GError *tmp = NULL;
if (priv->image_module && priv->image_module->stop_load && priv->context) 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); retval = priv->image_module->stop_load (priv->context, error);
priv->closed = TRUE; priv->closed = TRUE;
@ -540,3 +547,5 @@ gdk_pixbuf_loader_close (GdkPixbufLoader *loader,
return retval; return retval;
} }