aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuri Linkov2014-09-18 23:59:55 +0300
committerJuri Linkov2014-09-18 23:59:55 +0300
commit3a449b759c008c5c2ffa4524f09d8d90e1c764d4 (patch)
tree36b61caf28cb9bb4aca23efc05f8c4e9069ee205 /src
parent46b189d794059d05c1f517ece236dbcf16a659e7 (diff)
downloademacs-3a449b759c008c5c2ffa4524f09d8d90e1c764d4.tar.gz
emacs-3a449b759c008c5c2ffa4524f09d8d90e1c764d4.zip
* src/image.c (imagemagick_load_image): Add delay to imagemagick metadata.
(Bug#10747, bug#18334)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/image.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b442158a828..ea4dde398a7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-09-18 Juri Linkov <juri@jurta.org>
2
3 * image.c (imagemagick_load_image): Add delay to imagemagick metadata.
4 (Bug#10747, bug#18334)
5
12014-09-18 Eli Zaretskii <eliz@gnu.org> 62014-09-18 Eli Zaretskii <eliz@gnu.org>
2 7
3 * frame.c (Fmouse_position, Fset_mouse_position): Clarify the 8 * frame.c (Fmouse_position, Fset_mouse_position): Clarify the
diff --git a/src/image.c b/src/image.c
index 13efc80ab26..b47a35dd713 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8232,6 +8232,12 @@ imagemagick_load_image (struct frame *f, struct image *img,
8232 return 0; 8232 return 0;
8233 } 8233 }
8234 8234
8235 if (MagickGetImageDelay (image_wand) > 0)
8236 img->lisp_data =
8237 Fcons (Qdelay,
8238 Fcons (make_float (MagickGetImageDelay (image_wand) / 100.0),
8239 img->lisp_data));
8240
8235 if (MagickGetNumberImages (image_wand) > 1) 8241 if (MagickGetNumberImages (image_wand) > 1)
8236 img->lisp_data = 8242 img->lisp_data =
8237 Fcons (Qcount, 8243 Fcons (Qcount,