diff options
| author | Lars Magne Ingebrigtsen | 2013-08-14 15:50:03 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2013-08-14 15:50:03 +0200 |
| commit | 4ce82fb8d9232e123d9e58b00851b775d1586646 (patch) | |
| tree | 49b9e1940ab9abab07ef7ad6ed9655abfc113395 /src | |
| parent | 14d1e4634c80f0ba07181efc3e5b251d3a92e182 (diff) | |
| download | emacs-4ce82fb8d9232e123d9e58b00851b775d1586646.tar.gz emacs-4ce82fb8d9232e123d9e58b00851b775d1586646.zip | |
* image.c (imagemagick_load_image): Make animated pictures work.
There's still some problems with background color settings, though.
Fixes: debbugs:14700
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/image.c | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index eeae85a888c..548ae5ab2c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2013-08-14 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2013-08-14 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * image.c (imagemagick_load_image): Make animated pictures work. | ||
| 4 | There's still some problems with background color settings, though | ||
| 5 | (bug#14700). | ||
| 6 | |||
| 3 | * decompress.c (unwind_decompress): Always restore point. | 7 | * decompress.c (unwind_decompress): Always restore point. |
| 4 | 8 | ||
| 5 | 2013-08-14 Paul Eggert <eggert@cs.ucla.edu> | 9 | 2013-08-14 Paul Eggert <eggert@cs.ucla.edu> |
diff --git a/src/image.c b/src/image.c index d93d1b517bf..b2d6726c1a4 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7967,6 +7967,16 @@ imagemagick_load_image (struct frame *f, struct image *img, | |||
| 7967 | goto imagemagick_error; | 7967 | goto imagemagick_error; |
| 7968 | } | 7968 | } |
| 7969 | 7969 | ||
| 7970 | /* If we have an animated image, get the new wand based on the | ||
| 7971 | "super-wand". */ | ||
| 7972 | if (ino > 0) | ||
| 7973 | { | ||
| 7974 | MagickWand *super_wand = image_wand; | ||
| 7975 | MagickSetIteratorIndex (super_wand, ino); | ||
| 7976 | image_wand = MagickGetImage (super_wand); | ||
| 7977 | DestroyMagickWand (super_wand); | ||
| 7978 | } | ||
| 7979 | |||
| 7970 | /* Retrieve the frame's background color, for use later. */ | 7980 | /* Retrieve the frame's background color, for use later. */ |
| 7971 | { | 7981 | { |
| 7972 | XColor bgcolor; | 7982 | XColor bgcolor; |