diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2020-11-09 12:52:03 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2020-11-09 12:52:03 +0000 |
| commit | 5286af4138046df96c406b48d48b4da31e1820ad (patch) | |
| tree | 1e9a64613a06c5fa420a4cdf8e9a33b99a0db373 /gdk-pixbuf | |
| parent | be6282cb90078d2df49d12bdb13b44b6cfe3a32c (diff) | |
| parent | 7d1f42d204433ab7585d16202592b8f4d8d9e4eb (diff) | |
| download | gdk-pixbuf-5286af4138046df96c406b48d48b4da31e1820ad.tar.gz | |
Merge branch 'gif-colormap-bug' into 'master'
gif: Fix bug where the local colormap is not dropped.
Closes #156
See merge request GNOME/gdk-pixbuf!79
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/io-gif.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c index 86f4ce67a..b08a00bd6 100644 --- a/gdk-pixbuf/io-gif.c +++ b/gdk-pixbuf/io-gif.c @@ -100,7 +100,6 @@ struct _GifContext gint global_colormap_size; unsigned int global_bit_pixel; - gboolean frame_cmap_active; CMap frame_color_map; gint frame_colormap_size; unsigned int frame_bit_pixel; @@ -223,7 +222,6 @@ gif_set_get_colormap (GifContext *context) static void gif_set_get_colormap2 (GifContext *context) { - context->frame_colormap_size = 0; context->state = GIF_GET_COLORMAP2; } @@ -681,6 +679,7 @@ gif_get_frame_info (GifContext *context) context->disposal, context->delay_time, context->transparent_index, context->frame_interlace); #endif + context->frame_colormap_size = 0; if (BitSet (buf[8], LOCALCOLORMAP)) { #ifdef DUMP_IMAGE_DETAILS @@ -692,7 +691,6 @@ gif_get_frame_info (GifContext *context) * of an animated gif. */ /* if it does, we need to re-read in the colormap, * the gray_scale, and the bit_pixel */ - context->frame_cmap_active = TRUE; context->frame_bit_pixel = 1 << ((buf[8] & 0x07) + 1); gif_set_get_colormap2 (context); return 0; |