diff options
| author | Juri Linkov <juri@jurta.org> | 2011-11-24 21:02:39 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2011-11-24 21:02:39 +0200 |
| commit | fa4fdb5ca559f8aae4137f8d3b974c14c760360d (patch) | |
| tree | 90f450f03cb094c9d9be3ad16706c9117eafee30 | |
| parent | 82727ea451c51c1347dacc0cef579d8ce5985464 (diff) | |
| download | emacs-fa4fdb5ca559f8aae4137f8d3b974c14c760360d.tar.gz | |
* src/image.c (imagemagick_load_image): Move `MagickSetResolution' down
after the `MagickPingImage' call.
Fixes: debbugs:10112
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/image.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 42e54c41dff..59115a910e3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-11-24 Juri Linkov <juri@jurta.org> + + * image.c (imagemagick_load_image): Move `MagickSetResolution' down + after the `MagickPingImage' call. (Bug#10112) + 2011-11-23 Chong Yidong <cyd@gnu.org> * window.c (Fcoordinates_in_window_p): Accept only live windows. diff --git a/src/image.c b/src/image.c index 8b61c7eefbc..81907d8e580 100644 --- a/src/image.c +++ b/src/image.c @@ -7618,7 +7618,7 @@ imagemagick_load_image (struct frame *f, struct image *img, image = image_spec_value (img->spec, QCindex, NULL); ino = INTEGERP (image) ? XFASTINT (image) : 0; ping_wand = NewMagickWand (); - MagickSetResolution (ping_wand, 2, 2); + if (filename != NULL) { status = MagickPingImage (ping_wand, filename); @@ -7628,6 +7628,8 @@ imagemagick_load_image (struct frame *f, struct image *img, status = MagickPingImageBlob (ping_wand, contents, size); } + MagickSetResolution (ping_wand, 2, 2); + if (! (0 <= ino && ino < MagickGetNumberImages (ping_wand))) { image_error ("Invalid image number `%s' in image `%s'", |