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

Fill in missing error parameters to DecodeHeader and DecodeColormap.

Browse Source 
2001-11-28  Manish Singh  <yosh@gimp.org>

        * gdk-pixbuf/io-bmp.c (gdk_pixbuf__bmp_image_load_increment): Fill
        in missing error parameters to DecodeHeader and DecodeColormap.
This commit is contained in:
Manish Singh 2001-11-29 01:39:34 +00:00 committed by Manish Singh
parent ea644d3572
commit a0dd3bc884
2 changed files with 10 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 @@
2001-11-28 Manish Singh <yosh@gimp.org>
* 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 <federico@ximian.com> 2001-11-21 Federico Mena Quintero <federico@ximian.com>
Fix Ximian bug #12125; merged from gdk-pixbuf stable. Fix Ximian bug #12125; merged from gdk-pixbuf stable.

8
gdk-pixbuf/io-bmp.c
View File

@ -531,7 +531,7 @@ OneLine24 is the 24 bpp-version.
*/ */
static void OneLine32(struct bmp_progressive_state *context) static void OneLine32(struct bmp_progressive_state *context)
{ {
gint X; int i; int i;
guchar *pixels; guchar *pixels;
guchar *src; guchar *src;
@ -966,13 +966,15 @@ gdk_pixbuf__bmp_image_load_increment(gpointer data,
switch (context->read_state) { switch (context->read_state) {
case READ_STATE_HEADERS: case READ_STATE_HEADERS:
if (!DecodeHeader (context->buff, context->buff + 14, context)) if (!DecodeHeader (context->buff,
context->buff + 14, context,
error))
return FALSE; return FALSE;
break; break;
case READ_STATE_PALETTE: case READ_STATE_PALETTE:
DecodeColormap (context->buff, context); DecodeColormap (context->buff, context, error);
break; break;
case READ_STATE_BITMASKS: case READ_STATE_BITMASKS: