Port to clang 3.7.0 on x86-64

[gnu-emacs] / src / image.c

diff --git a/src/image.c b/src/image.c
index 45abfc7af76ae1bb0271714440b0135cdda76b1f..a44b90b78e7f6b6d1dd4fb77844d68774e4d481c 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -6,8 +6,8 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -8546,16 +8546,6 @@ imagemagick_load_image (struct frame *f, struct image *img,
       return 0;
     }
 
-  /* If no :rotation is explicitly specified, apply the automatic
-     rotation from EXIF. */
-  if (NILP (image_spec_value (img->spec, QCrotation, NULL)))
-    if (MagickAutoOrientImage (image_wand) == MagickFalse)
-      {
-        image_error ("Error applying automatic orientation in image `%s'", img->spec);
-        DestroyMagickWand (image_wand);
-        return 0;
-      }
-
   if (ino < 0 || ino >= MagickGetNumberImages (image_wand))
     {
       image_error ("Invalid image number `%s' in image `%s'", image, img->spec);
@@ -8656,7 +8646,7 @@ imagemagick_load_image (struct frame *f, struct image *img,
     image_spec_value (img->spec, QCbackground, NULL); if (!STRINGP
     (specified_bg).  */
   value = image_spec_value (img->spec, QCrotation, NULL);
-  if (FLOATP (value) || INTEGERP (value))
+  if (FLOATP (value))
     {
       rotation = extract_float (value);
       status = MagickRotateImage (image_wand, bg_wand, rotation);