* src/image.c (imagemagick_load_image): Add delay to imagemagick metadata.

(Bug#10747, bug#18334)

diff --git a/src/ChangeLog b/src/ChangeLog
index b442158a82899da4d3eb5823534ad2e6c98a5224..ea4dde398a7e24ca4166095534297c3c13e44e68 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-18  Juri Linkov  <juri@jurta.org>
+
+       * image.c (imagemagick_load_image): Add delay to imagemagick metadata.
+       (Bug#10747, bug#18334)
+
 2014-09-18  Eli Zaretskii  <eliz@gnu.org>
 
        * frame.c (Fmouse_position, Fset_mouse_position): Clarify the

diff --git a/src/image.c b/src/image.c
index 13efc80ab2632efca168fe2582f2313283f6fab7..b47a35dd71382aad087a352b65c434bab5b757d5 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -8232,6 +8232,12 @@ imagemagick_load_image (struct frame *f, struct image *img,
       return 0;
     }
 
+  if (MagickGetImageDelay (image_wand) > 0)
+    img->lisp_data =
+      Fcons (Qdelay,
+             Fcons (make_float (MagickGetImageDelay (image_wand) / 100.0),
+                    img->lisp_data));
+
   if (MagickGetNumberImages (image_wand) > 1)
     img->lisp_data =
       Fcons (Qcount,