From fa4fdb5ca559f8aae4137f8d3b974c14c760360d Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 24 Nov 2011 21:02:39 +0200 Subject: [PATCH] * src/image.c (imagemagick_load_image): Move `MagickSetResolution' down after the `MagickPingImage' call. Fixes: debbugs:10112 --- src/ChangeLog | 5 +++++ src/image.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 + + * image.c (imagemagick_load_image): Move `MagickSetResolution' down + after the `MagickPingImage' call. (Bug#10112) + 2011-11-23 Chong Yidong * 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'", -- 2.39.5