procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Support integer image rotation and respect EXIF rotations"

Browse source 
This reverts commit 0f60049605.

This change does not work on Fedora.
This commit is contained in:
Lars Ingebrigtsen 2016-02-11 14:05:24 +11:00
parent afe7d1f72f
commit f5d6b9bb5b
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/image.c
View file

@ -8546,16 +8546,6 @@ imagemagick_load_image (struct frame *f, struct image *img,
return 0; 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)) if (ino < 0 || ino >= MagickGetNumberImages (image_wand))
{ {
image_error ("Invalid image number `%s' in image `%s'", image, img->spec); 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 image_spec_value (img->spec, QCbackground, NULL); if (!STRINGP
(specified_bg). */ (specified_bg). */
value = image_spec_value (img->spec, QCrotation, NULL); value = image_spec_value (img->spec, QCrotation, NULL);
if (FLOATP (value) || INTEGERP (value)) if (FLOATP (value))
{ {
rotation = extract_float (value); rotation = extract_float (value);
status = MagickRotateImage (image_wand, bg_wand, rotation); status = MagickRotateImage (image_wand, bg_wand, rotation);