diff options
| author | Lars Ingebrigtsen | 2016-02-11 14:21:38 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-11 14:21:38 +1100 |
| commit | 980836d80e2447d8922f0f6cf287a12a6c914e8b (patch) | |
| tree | 5b5c6ba0de0019b4181d74cb265d5d5acf8df43c /src | |
| parent | 363e7097b65eaf8474ea40d9665c25ed71f6ae5c (diff) | |
| download | emacs-980836d80e2447d8922f0f6cf287a12a6c914e8b.tar.gz emacs-980836d80e2447d8922f0f6cf287a12a6c914e8b.zip | |
Check for MagickAutoOrientImage
* configure.ac: Check for MagickAutoOrientImage.
* src/image.c (imagemagick_load_image): Don't use
MagickAutoOrientImage unless it's available.
Diffstat (limited to 'src')
| -rw-r--r-- | src/image.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/image.c b/src/image.c index e1b167de3d2..f22394fb7cb 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -8560,6 +8560,7 @@ imagemagick_load_image (struct frame *f, struct image *img, | |||
| 8560 | return 0; | 8560 | return 0; |
| 8561 | } | 8561 | } |
| 8562 | 8562 | ||
| 8563 | #ifdef HAVE_MAGICKAUTOORIENTIMAGE | ||
| 8563 | /* If no :rotation is explicitly specified, apply the automatic | 8564 | /* If no :rotation is explicitly specified, apply the automatic |
| 8564 | rotation from EXIF. */ | 8565 | rotation from EXIF. */ |
| 8565 | if (NILP (image_spec_value (img->spec, QCrotation, NULL))) | 8566 | if (NILP (image_spec_value (img->spec, QCrotation, NULL))) |
| @@ -8569,6 +8570,7 @@ imagemagick_load_image (struct frame *f, struct image *img, | |||
| 8569 | DestroyMagickWand (image_wand); | 8570 | DestroyMagickWand (image_wand); |
| 8570 | return 0; | 8571 | return 0; |
| 8571 | } | 8572 | } |
| 8573 | #endif | ||
| 8572 | 8574 | ||
| 8573 | if (ino < 0 || ino >= MagickGetNumberImages (image_wand)) | 8575 | if (ino < 0 || ino >= MagickGetNumberImages (image_wand)) |
| 8574 | { | 8576 | { |