[gdk-pixbuf: 2/2] Merge branch 'gif-colormap-bug' into 'master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 5286af4138046df96c406b48d48b4da31e1820ad
Merge: be6282cb90 7d1f42d204
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Mon Nov 9 12:52:03 2020 +0000

    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

 gdk-pixbuf/io-gif.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --cc gdk-pixbuf/io-gif.c
index 86f4ce67aa,2a7afd049d..b08a00bd62
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@@ -99,8 -109,9 +99,7 @@@ struct _GifContex
  
          gint global_colormap_size;
          unsigned int global_bit_pixel;
 -      unsigned int global_color_resolution;
 -        unsigned int background_index;
  
-         gboolean frame_cmap_active;
          CMap frame_color_map;
          gint frame_colormap_size;
          unsigned int frame_bit_pixel;
@@@ -678,9 -691,10 +676,10 @@@ gif_get_frame_info (GifContext *context
  #ifdef DUMP_IMAGE_DETAILS
          g_print (">width: %d height: %d xoffset: %d yoffset: %d disposal: %d delay: %d transparent: %d 
interlace: %d\n",
                   context->frame_len, context->frame_height, context->x_offset, context->y_offset,
 -                 context->gif89.disposal, context->gif89.delay_time, context->gif89.transparent, 
context->frame_interlace);
 +                 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