fixing xmp tag orientation generated by exiftool

REDxEYE · Jul 25, 2022 · 6e97da0 · 6e97da0
1 parent ce7af49
commit 6e97da0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/Tests/images/xmp_orientation_exifool.png b/Tests/images/xmp_orientation_exifool.png
diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py
@@ -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_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

diff --git a/src/PIL/Image.py b/src/PIL/Image.py
@@ -1407,6 +1407,12 @@ def getexif(self):
                 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
 

diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py
@@ -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()