[Emacs-diffs] emacs-24 r117510: * src/image.c (imagemagick_load_image): Add delay to imagemagick metadata.

[Juri Linkov]

------------------------------------------------------------
revno: 117510
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18334
committer: Juri Linkov <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-09-18 23:59:55 +0300
message:
  * src/image.c (imagemagick_load_image): Add delay to imagemagick metadata.
  (Bug#10747, bug#18334)
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/image.c                    image.c-20091113204419-o5vbwnq5f7feedwu-2969

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-18 17:20:57 +0000
+++ b/src/ChangeLog     2014-09-18 20:59:55 +0000
@@ -1,3 +1,8 @@
+2014-09-18  Juri Linkov  <address@hidden>
+
+       * image.c (imagemagick_load_image): Add delay to imagemagick metadata.
+       (Bug#10747, bug#18334)
+
 2014-09-18  Eli Zaretskii  <address@hidden>
 
        * frame.c (Fmouse_position, Fset_mouse_position): Clarify the

=== modified file 'src/image.c'
--- a/src/image.c       2014-06-18 16:57:26 +0000
+++ b/src/image.c       2014-09-18 20:59:55 +0000
@@ -8232,6 +8232,12 @@
       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,