Fix misdisplay of interlaced GIFs with libgif5.

* image.c (gif_load): libgif5 deinterlaces for us, so don't do
it again.

Fixes: debbugs:16372

diff --git a/src/ChangeLog b/src/ChangeLog
index a9575a142235edaf1ccb6da80b6773299d4cbbc8..8df6e31521dda4534186dd5b2a47307a3bc77a6c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix misdisplay of interlaced GIFs with libgif5 (Bug#16372).
+       * image.c (gif_load): libgif5 deinterlaces for us, so don't do
+       it again.
+
 2014-01-06  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (redisplay_window): Don't skip window redisplay if the

diff --git a/src/image.c b/src/image.c
index 7d6445527a98b47586e88bd27c1afdd6fc02a202..cbc869127d0a5079df0fd9b29fd9b584c04d14e3 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -7586,7 +7586,7 @@ gif_load (struct frame *f, struct image *img)
          }
 
       /* Apply the pixel values.  */
-      if (gif->SavedImages[j].ImageDesc.Interlace)
+      if (GIFLIB_MAJOR < 5 && gif->SavedImages[j].ImageDesc.Interlace)
        {
          int row, pass;