Fix misdisplay of interlaced GIFs with libgif5.

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

Fixes: debbugs:16372

2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a9575a14223..8df6e31521d 100644
--- 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 7d6445527a9..cbc869127d0 100644
--- 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;