[Emacs-diffs] trunk r113876: * image.c (imagemagick_load_image): Make animated pictures work.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 113876
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14700
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2013-08-14 15:50:03 +0200
message:
  * image.c (imagemagick_load_image): Make animated pictures work.
  
  There's still some problems with background color settings, though.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-14 12:47:05 +0000
+++ b/src/ChangeLog     2013-08-14 13:50:03 +0000
@@ -1,5 +1,9 @@
 2013-08-14  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'src/image.c'
--- a/src/image.c       2013-08-14 07:00:25 +0000
+++ b/src/image.c       2013-08-14 13:50:03 +0000
@@ -7967,6 +7967,16 @@
       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;