AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 06:00:22 +00:00
Code Issues Projects Releases Wiki Activity

set the transparency to the right val.

Browse Source 
1999-11-03  Jonathan Blandford  <jrb@redhat.com>

	* src/io-gif.c (gif_get_lzw): set the transparency to the right
          val.
This commit is contained in:
Jonathan Blandford 1999-11-03 22:19:42 +00:00 committed by Jonathan Blandford
parent 317e8b06ae
commit 5869210788
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk-pixbuf/ChangeLog
View File

@ -11,6 +11,7 @@
* src/io-gif.c (image_load_increment): now handle arbitrary buffer * src/io-gif.c (image_load_increment): now handle arbitrary buffer
sizes. sizes.
(gif_get_lzw): set the transparency to the right val.
1999-11-03 Federico Mena Quintero <federico@redhat.com> 1999-11-03 Federico Mena Quintero <federico@redhat.com>

21
gdk-pixbuf/io-gif.c
View File

@ -153,8 +153,10 @@ struct _GifContext
static int GetDataBlock (GifContext *, unsigned char *); static int GetDataBlock (GifContext *, unsigned char *);
#ifdef IO_GIFDEBUG
static int count = 0; static int count = 0;
#endif
/* Returns TRUE if Read is OK, /* Returns TRUE if Read is OK,
* FALSE if more memory is needed. */ * FALSE if more memory is needed. */
static int static int
@ -165,8 +167,8 @@ ReadOK (GifContext *context, guchar *buffer, size_t len)
gint i; gint i;
#endif #endif
if (context->file) { if (context->file) {
count += len;
#ifdef IO_GIFDEBUG #ifdef IO_GIFDEBUG
count += len;
g_print ("Fsize :%d\tcount :%d\t", len, count); g_print ("Fsize :%d\tcount :%d\t", len, count);
#endif #endif
retval = (fread(buffer, len, 1, context->file) != 0); retval = (fread(buffer, len, 1, context->file) != 0);
@ -183,8 +185,10 @@ ReadOK (GifContext *context, guchar *buffer, size_t len)
// g_print ("\tlooking for %d bytes. size == %d, ptr == %d\n", len, context->size, context->ptr); // g_print ("\tlooking for %d bytes. size == %d, ptr == %d\n", len, context->size, context->ptr);
#endif #endif
if ((context->size - context->ptr) >= len) { if ((context->size - context->ptr) >= len) {
#ifdef IO_GIFDEBUG
count += len; count += len;
memmove (buffer, context->buf + context->ptr, len); #endif
memcpy (buffer, context->buf + context->ptr, len);
context->ptr += len; context->ptr += len;
context->amount_needed = 0; context->amount_needed = 0;
#ifdef IO_GIFDEBUG #ifdef IO_GIFDEBUG
@ -329,10 +333,11 @@ gif_get_extension (GifContext *context)
if (context->pixbuf == NULL) { if (context->pixbuf == NULL) {
/* I only want to set the transparency if I haven't /* I only want to set the transparency if I haven't
* created the pixbuf yet. */ * created the pixbuf yet. */
if ((context->block_buf[0] & 0x1) != 0) if ((context->block_buf[0] & 0x1) != 0) {
context->gif89.transparent = context->block_buf[3]; context->gif89.transparent = context->block_buf[3];
else } else {
context->gif89.transparent = -1; context->gif89.transparent = FALSE;
}
} }
/* Now we've successfully loaded this one, we continue on our way */ /* Now we've successfully loaded this one, we continue on our way */
@ -660,7 +665,7 @@ gif_get_lzw (GifContext *context)
*temp = context->color_map [0][(guchar) v]; *temp = context->color_map [0][(guchar) v];
*(temp+1) = context->color_map [1][(guchar) v]; *(temp+1) = context->color_map [1][(guchar) v];
*(temp+2) = context->color_map [2][(guchar) v]; *(temp+2) = context->color_map [2][(guchar) v];
*(temp+3) = (guchar) ((v == context->gif89.transparent) ? 0 : 65535); *(temp+3) = (guchar) ((v == context->gif89.transparent) ? 0 : -1);
} else { } else {
temp = dest + context->draw_ypos * gdk_pixbuf_get_rowstride (context->pixbuf) + context->draw_xpos * 3; temp = dest + context->draw_ypos * gdk_pixbuf_get_rowstride (context->pixbuf) + context->draw_xpos * 3;
*temp = context->color_map [0][(guchar) v]; *temp = context->color_map [0][(guchar) v];
@ -962,7 +967,9 @@ image_begin_load (ModulePreparedNotifyFunc func, gpointer user_data)
{ {
GifContext *context; GifContext *context;
#ifdef IO_GIFDEBUG
count = 0; count = 0;
#endif
context = g_new (GifContext, 1); context = g_new (GifContext, 1);
context->func = func; context->func = func;
context->user_data = user_data; context->user_data = user_data;