summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2016-02-11 14:05:24 +1100
committerLars Ingebrigtsen <larsi@gnus.org>2016-02-11 14:05:48 +1100
commitf5d6b9bb5b307067547f0b26c74e9f538464bfc6 (patch)
treebe9fa8e4cae892a11bbea9c7e7ef2564ac958a0a
parentafe7d1f72f78cfd8ce4b6fec6b0be49f49751fd2 (diff)
downloademacs-f5d6b9bb5b307067547f0b26c74e9f538464bfc6.tar.gz
Revert "Support integer image rotation and respect EXIF rotations"
This reverts commit 0f600496050bf435f55dc81056e06fcd45992dc8. This change does not work on Fedora.
-rw-r--r--src/image.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/image.c b/src/image.c
index 45abfc7af76..144fe30a746 100644
--- a/src/image.c
+++ b/src/image.c
@@ -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);