[Emacs-diffs] /srv/bzr/emacs/trunk r106509: * src/image.c (imagemagick_load_image): Move `MagickSetResolution' down

[Juri Linkov]

------------------------------------------------------------
revno: 106509
fixes bug(s): http://debbugs.gnu.org/10112
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2011-11-24 21:02:39 +0200
message:
  * src/image.c (imagemagick_load_image): Move `MagickSetResolution' down
  after the `MagickPingImage' call.
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-11-23 16:09:08 +0000
+++ b/src/ChangeLog     2011-11-24 19:02:39 +0000
@@ -1,3 +1,8 @@
+2011-11-24  Juri Linkov  <address@hidden>
+
+       * image.c (imagemagick_load_image): Move `MagickSetResolution' down
+       after the `MagickPingImage' call.  (Bug#10112)
+
 2011-11-23  Chong Yidong  <address@hidden>
 
        * window.c (Fcoordinates_in_window_p): Accept only live windows.

=== modified file 'src/image.c'
--- a/src/image.c       2011-11-20 02:29:42 +0000
+++ b/src/image.c       2011-11-24 19:02:39 +0000
@@ -7618,7 +7618,7 @@
   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 @@
       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'",