penwing/zeniba-nsxiv
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: jpeg exif orientation on Imlib2 v1.7.5 (#188)

Browse source 
since Imlib2 v1.7.5, it is capable of parsing exif data on jpeg files
and auto orienting them. this caused nsxiv to rotate the image twice.

Closes: https://github.com/nsxiv/nsxiv/issues/187
This commit is contained in:
N-R-K 2022-01-02 02:28:19 +06:00 committed by GitHub
parent e777adf985
commit e839638156
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
image.c
View file

@ -439,7 +439,11 @@ bool img_load(img_t *img, const fileinfo_t *file)
imlib_image_set_changes_on_disk(); imlib_image_set_changes_on_disk();
#if HAVE_LIBEXIF /* since v1.7.5, Imlib2 can parse exif orientation from jpeg files.
* this version also happens to be the first one which defines the
* IMLIB2_VERSION macro.
*/
#if HAVE_LIBEXIF && !defined(IMLIB2_VERSION)
exif_auto_orientate(file); exif_auto_orientate(file);
#endif #endif
@ -451,6 +455,10 @@ bool img_load(img_t *img, const fileinfo_t *file)
#if HAVE_LIBWEBP #if HAVE_LIBWEBP
if (STREQ(fmt, "webp")) if (STREQ(fmt, "webp"))
img_load_webp(img, file); img_load_webp(img, file);
#endif
#if HAVE_LIBEXIF && defined(IMLIB2_VERSION)
if (!STREQ(fmt, "jpeg") && !STREQ(fmt, "jpg"))
exif_auto_orientate(file);
#endif #endif
} }
img->w = imlib_image_get_width(); img->w = imlib_image_get_width();