diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index ac046bdff9..abfe6f89cc 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2001-11-28 Manish Singh + + * gdk-pixbuf/io-bmp.c (gdk_pixbuf__bmp_image_load_increment): Fill + in missing error parameters to DecodeHeader and DecodeColormap. + 2001-11-21 Federico Mena Quintero Fix Ximian bug #12125; merged from gdk-pixbuf stable. diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c index 9ee65013da..225cbde343 100644 --- a/gdk-pixbuf/io-bmp.c +++ b/gdk-pixbuf/io-bmp.c @@ -531,7 +531,7 @@ OneLine24 is the 24 bpp-version. */ static void OneLine32(struct bmp_progressive_state *context) { - gint X; int i; + int i; guchar *pixels; guchar *src; @@ -966,13 +966,15 @@ gdk_pixbuf__bmp_image_load_increment(gpointer data, switch (context->read_state) { case READ_STATE_HEADERS: - if (!DecodeHeader (context->buff, context->buff + 14, context)) + if (!DecodeHeader (context->buff, + context->buff + 14, context, + error)) return FALSE; break; case READ_STATE_PALETTE: - DecodeColormap (context->buff, context); + DecodeColormap (context->buff, context, error); break; case READ_STATE_BITMASKS: