Skip to content

Parse orientation from XMP tag contents #6463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 7 commits into from
Jul 30, 2022
Merged

Parse orientation from XMP tag contents #6463

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6e97da0
fixing xmp tag orientation generated by exiftool
bigcat88 Jul 25, 2022
db20d0f
fixing typo in filetest name
bigcat88 Jul 25, 2022
f42e255
Simplified code
radarhere Jul 26, 2022
cce09b7
Merge pull request #1 from radarhere/xmp-tags-orientation
bigcat88 Jul 26, 2022
7e1261c
Simplified test code
radarhere Jul 27, 2022
bac83f7
Check that orientation is still absent after reloading Exif
radarhere Jul 27, 2022
5d8dacf
Merge pull request #2 from radarhere/xmp-tags-orientation
bigcat88 Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Tests/images/xmp_tags_orientation_exiftool.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions Tests/test_imageops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,13 @@ def check(orientation_im):
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_tags_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
Expand Down
4 changes: 2 additions & 2 deletions src/PIL/Image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1404,9 +1404,9 @@ def getexif(self):
if 0x0112 not in self._exif:
xmp_tags = self.info.get("XML:com.adobe.xmp")
if xmp_tags:
match = re.search(r'tiff:Orientation="([0-9])"', xmp_tags)
match = re.search(r'tiff:Orientation(="|>)([0-9])', xmp_tags)
if match:
self._exif[0x0112] = int(match[1])
self._exif[0x0112] = int(match[2])

return self._exif

Expand Down
10 changes: 6 additions & 4 deletions src/PIL/ImageOps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,10 +601,12 @@ def exif_transpose(image):
"Raw profile type exif"
] = transposed_exif.tobytes().hex()
elif "XML:com.adobe.xmp" in transposed_image.info:
transposed_image.info["XML:com.adobe.xmp"] = re.sub(
for pattern in (
r'tiff:Orientation="([0-9])"',
"",
transposed_image.info["XML:com.adobe.xmp"],
)
r"<tiff:Orientation>([0-9])</tiff:Orientation>",
):
transposed_image.info["XML:com.adobe.xmp"] = re.sub(
pattern, "", transposed_image.info["XML:com.adobe.xmp"]
)
return transposed_image
return image.copy()