python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-26 01:04:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixing xmp tag orientation generated by exiftool

Browse Source
This commit is contained in:
Alexander Piskun 2022-07-26 00:30:32 +03:00
parent ce7af49eed
commit 6e97da0260
No known key found for this signature in database
GPG Key ID: 1F0BF0EC3CF22721
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/xmp_orientation_exifool.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

7
Tests/test_imageops.py
View File

@ -351,6 +351,13 @@ def test_exif_transpose():
transposed_im = ImageOps.exif_transpose(im)
assert 0x0112 not in transposed_im.getexif()
# Orientation from "XML:com.adobe.xmp" info key (from exiftool)
with Image.open("Tests/images/xmp_orientation_exiftool.png") as im:
assert im.getexif()[0x0112] == 8
transposed_im = ImageOps.exif_transpose(im)
assert 0x0112 not in transposed_im.getexif()
# Orientation from "Raw profile type exif" info key
# This test image has been manually hexedited from exif_imagemagick.png
# to have a different orientation

6
src/PIL/Image.py
View File

@ -1407,6 +1407,12 @@ class Image:
match = re.search(r'tiff:Orientation="([0-9])"', xmp_tags)
if match:
self._exif[0x0112] = int(match[1])
else:
match = re.search(
r"<tiff:Orientation>([0-9])</tiff:Orientation>", xmp_tags
)
if match:
self._exif[0x0112] = int(match[1])
return self._exif

5
src/PIL/ImageOps.py
View File

@ -606,5 +606,10 @@ def exif_transpose(image):
"",
transposed_image.info["XML:com.adobe.xmp"],
)
transposed_image.info["XML:com.adobe.xmp"] = re.sub(
r"<tiff:Orientation>([0-9])</tiff:Orientation>",
"",
transposed_image.info["XML:com.adobe.xmp"],
)
return transposed_image
return image.copy()