From f5d6b9bb5b307067547f0b26c74e9f538464bfc6 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Thu, 11 Feb 2016 14:05:24 +1100 Subject: [PATCH] Revert "Support integer image rotation and respect EXIF rotations" This reverts commit 0f600496050bf435f55dc81056e06fcd45992dc8. This change does not work on Fedora. --- src/image.c | 12 +----------- 1 file changed, 1 insertion(+), 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); -- 2.39.5