* image.c (imagemagick_load_image): Make animated pictures work.

There's still some problems with background color settings, though.

Fixes: debbugs:14700

diff --git a/src/ChangeLog b/src/ChangeLog
index eeae85a888cf17fabb4ab640d823d0c89ceaf007..548ae5ab2c0d332cf59c655141e8288b4e474985 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2013-08-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * image.c (imagemagick_load_image): Make animated pictures work.
+       There's still some problems with background color settings, though
+       (bug#14700).
+
        * decompress.c (unwind_decompress): Always restore point.
 
 2013-08-14  Paul Eggert  <eggert@cs.ucla.edu>

diff --git a/src/image.c b/src/image.c
index d93d1b517bfa7178a75908f45bb8bbf2c0a936b6..b2d6726c1a4d9defb203e139e86a15cfb2330d48 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -7967,6 +7967,16 @@ imagemagick_load_image (struct frame *f, struct image *img,
       goto imagemagick_error;
     }
 
+  /* If we have an animated image, get the new wand based on the
+     "super-wand". */
+  if (ino > 0)
+    {
+      MagickWand *super_wand = image_wand;
+      MagickSetIteratorIndex (super_wand, ino);
+      image_wand = MagickGetImage (super_wand);
+      DestroyMagickWand (super_wand);
+    }
+
   /* Retrieve the frame's background color, for use later.  */
   {
     XColor bgcolor;