callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some bug fixes - now tested to work.

Browse Source 
* io-wbmp.c: Some bug fixes - now tested to work.
This commit is contained in:
Elliot Lee
2000-08-01 00:33:49 +00:00
parent 75225b9f21
commit 4d72175087
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,6 @@
2000-07-31 Elliot Lee <sopwith@redhat.com>
* io-wbmp.c: Some bug fixes - now tested to work.
2000-07-27 Elliot Lee <sopwith@redhat.com> 2000-07-27 Elliot Lee <sopwith@redhat.com>
* gdk-pixbuf-io.h, gdk-pixbuf-io.c: Add gdk_pixbuf_get_named_module() function to facilitate above change * gdk-pixbuf-io.h, gdk-pixbuf-io.c: Add gdk_pixbuf_get_named_module() function to facilitate above change
* io-wbmp.c, pixbufloader_wbmp.defs, gdk-pixbuf-io.c, Makefile: Implement loader for WBMP format. * io-wbmp.c, pixbufloader_wbmp.defs, gdk-pixbuf-io.c, Makefile: Implement loader for WBMP format.

6
gdk-pixbuf/io-wbmp.c
View File

@ -199,7 +199,7 @@ get_mbi(struct wbmp_progressive_state *context, guchar **buf, guint *buf_size, i
} while(n < sizeof(intbuf) && (intbuf[n-1] & 0x80)); } while(n < sizeof(intbuf) && (intbuf[n-1] & 0x80));
out: out:
if(!rv || !(intbuf[n-1] & 0x80)) if(!rv || (intbuf[n-1] & 0x80))
{ {
rv = save_rest(context, intbuf, n); rv = save_rest(context, intbuf, n);
@ -263,6 +263,8 @@ gboolean gdk_pixbuf__wbmp_image_load_increment(gpointer data, guchar * buf,
{ {
context->need_height = FALSE; context->need_height = FALSE;
context->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, context->width, context->height); context->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, context->width, context->height);
g_assert(context->pixbuf);
if(context->prepared_func) if(context->prepared_func)
context->prepared_func(context->pixbuf, context->user_data); context->prepared_func(context->pixbuf, context->user_data);
} }
@ -283,7 +285,7 @@ gboolean gdk_pixbuf__wbmp_image_load_increment(gpointer data, guchar * buf,
goto out; goto out;
ptr = context->pixbuf->pixels + context->pixbuf->rowstride * context->cury + context->curx * 3; ptr = context->pixbuf->pixels + context->pixbuf->rowstride * context->cury + context->curx * 3;
for(xoff = 0; xoff < 8; xoff++, ptr += 3) for(xoff = 7; xoff >= 0; xoff--, ptr += 3)
{ {
guchar pixval; guchar pixval;