diff options
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-loader.c | 7 | ||||
| -rw-r--r-- | gtk/gdk-pixbuf-loader.c | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index cbbaafc85b..8d6792224a 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2000-01-05 Mark Crichton <crichton@gimp.org> + + * gdk-pixbuf/gdk-pixbuf-loader.c (gdk_pixbuf_loader_eat_header_write): + Return 0 if gdk_pixbuf_load_loader_module returns FALSE. + 2000-01-05 Elliot Lee <sopwith@redhat.com> * gdk-pixbuf/pixops/Makefile.am: Link with -lm (to get 'ceil' function) diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index cd1b91418b..69bb7f98ea 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -300,9 +300,10 @@ gdk_pixbuf_loader_eat_header_write (GdkPixbufLoader *loader, const guchar *buf, priv->header_buf_offset += nbytes; - if(priv->header_buf_offset >= LOADER_HEADER_SIZE) - gdk_pixbuf_loader_load_module(loader); - + if(priv->header_buf_offset >= LOADER_HEADER_SIZE) { + if (gdk_pixbuf_loader_load_module(loader) == 0) + return 0; + } return nbytes; } diff --git a/gtk/gdk-pixbuf-loader.c b/gtk/gdk-pixbuf-loader.c index cd1b91418b..69bb7f98ea 100644 --- a/gtk/gdk-pixbuf-loader.c +++ b/gtk/gdk-pixbuf-loader.c @@ -300,9 +300,10 @@ gdk_pixbuf_loader_eat_header_write (GdkPixbufLoader *loader, const guchar *buf, priv->header_buf_offset += nbytes; - if(priv->header_buf_offset >= LOADER_HEADER_SIZE) - gdk_pixbuf_loader_load_module(loader); - + if(priv->header_buf_offset >= LOADER_HEADER_SIZE) { + if (gdk_pixbuf_loader_load_module(loader) == 0) + return 0; + } return nbytes; } |