diff options
| author | Lars Ingebrigtsen | 2016-02-11 14:05:24 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-11 14:05:48 +1100 |
| commit | f5d6b9bb5b307067547f0b26c74e9f538464bfc6 (patch) | |
| tree | be9fa8e4cae892a11bbea9c7e7ef2564ac958a0a /src | |
| parent | afe7d1f72f78cfd8ce4b6fec6b0be49f49751fd2 (diff) | |
| download | emacs-f5d6b9bb5b307067547f0b26c74e9f538464bfc6.tar.gz emacs-f5d6b9bb5b307067547f0b26c74e9f538464bfc6.zip | |
Revert "Support integer image rotation and respect EXIF rotations"
This reverts commit 0f600496050bf435f55dc81056e06fcd45992dc8.
This change does not work on Fedora.
Diffstat (limited to 'src')
| -rw-r--r-- | src/image.c | 12 |
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, | |||
| 8546 | return 0; | 8546 | return 0; |
| 8547 | } | 8547 | } |
| 8548 | 8548 | ||
| 8549 | /* If no :rotation is explicitly specified, apply the automatic | ||
| 8550 | rotation from EXIF. */ | ||
| 8551 | if (NILP (image_spec_value (img->spec, QCrotation, NULL))) | ||
| 8552 | if (MagickAutoOrientImage (image_wand) == MagickFalse) | ||
| 8553 | { | ||
| 8554 | image_error ("Error applying automatic orientation in image `%s'", img->spec); | ||
| 8555 | DestroyMagickWand (image_wand); | ||
| 8556 | return 0; | ||
| 8557 | } | ||
| 8558 | |||
| 8559 | if (ino < 0 || ino >= MagickGetNumberImages (image_wand)) | 8549 | if (ino < 0 || ino >= MagickGetNumberImages (image_wand)) |
| 8560 | { | 8550 | { |
| 8561 | image_error ("Invalid image number `%s' in image `%s'", image, img->spec); | 8551 | 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, | |||
| 8656 | image_spec_value (img->spec, QCbackground, NULL); if (!STRINGP | 8646 | image_spec_value (img->spec, QCbackground, NULL); if (!STRINGP |
| 8657 | (specified_bg). */ | 8647 | (specified_bg). */ |
| 8658 | value = image_spec_value (img->spec, QCrotation, NULL); | 8648 | value = image_spec_value (img->spec, QCrotation, NULL); |
| 8659 | if (FLOATP (value) || INTEGERP (value)) | 8649 | if (FLOATP (value)) |
| 8660 | { | 8650 | { |
| 8661 | rotation = extract_float (value); | 8651 | rotation = extract_float (value); |
| 8662 | status = MagickRotateImage (image_wand, bg_wand, rotation); | 8652 | status = MagickRotateImage (image_wand, bg_wand, rotation); |