aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.c
diff options
context:
space:
mode:
authorJoakim Verona2011-12-28 04:12:56 +0100
committerJoakim Verona2011-12-28 04:12:56 +0100
commitbb29f044aa967831cd664c54eba0de0c701436ce (patch)
tree1398cc9780bbae0fdad071a3a3765a571c3f6d7b /src/image.c
parent3c935a7e996701244d166f684119f0ff97e25496 (diff)
parent5e605a2e528955721fc6f2bd7b9f174c15075fb1 (diff)
downloademacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.gz
emacs-bb29f044aa967831cd664c54eba0de0c701436ce.zip
upstream i think
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c4
1 files changed, 3 insertions, 1 deletions
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,
7618 image = image_spec_value (img->spec, QCindex, NULL); 7618 image = image_spec_value (img->spec, QCindex, NULL);
7619 ino = INTEGERP (image) ? XFASTINT (image) : 0; 7619 ino = INTEGERP (image) ? XFASTINT (image) : 0;
7620 ping_wand = NewMagickWand (); 7620 ping_wand = NewMagickWand ();
7621 MagickSetResolution (ping_wand, 2, 2); 7621
7622 if (filename != NULL) 7622 if (filename != NULL)
7623 { 7623 {
7624 status = MagickPingImage (ping_wand, filename); 7624 status = MagickPingImage (ping_wand, filename);
@@ -7628,6 +7628,8 @@ imagemagick_load_image (struct frame *f, struct image *img,
7628 status = MagickPingImageBlob (ping_wand, contents, size); 7628 status = MagickPingImageBlob (ping_wand, contents, size);
7629 } 7629 }
7630 7630
7631 MagickSetResolution (ping_wand, 2, 2);
7632
7631 if (! (0 <= ino && ino < MagickGetNumberImages (ping_wand))) 7633 if (! (0 <= ino && ino < MagickGetNumberImages (ping_wand)))
7632 { 7634 {
7633 image_error ("Invalid image number `%s' in image `%s'", 7635 image_error ("Invalid image number `%s' in image `%s'",