diff options
| author | Juri Linkov <juri@jurta.org> | 2014-09-18 23:59:55 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2014-09-18 23:59:55 +0300 |
| commit | 3a449b759c008c5c2ffa4524f09d8d90e1c764d4 (patch) | |
| tree | 36b61caf28cb9bb4aca23efc05f8c4e9069ee205 /src | |
| parent | 46b189d794059d05c1f517ece236dbcf16a659e7 (diff) | |
| download | emacs-3a449b759c008c5c2ffa4524f09d8d90e1c764d4.tar.gz | |
* src/image.c (imagemagick_load_image): Add delay to imagemagick metadata.
(Bug#10747, bug#18334)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 6 |
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 @@ +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 13efc80ab26..b47a35dd713 100644 --- 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, |