From 7e1261c6a0001c2302d391da24a44e2b5d669b57 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 27 Jul 2022 22:18:39 +1000
Subject: [PATCH 1/2] Simplified test code

---
 .../images/xmp_tags_orientation_exiftool.png  | Bin 1935 -> 1258 bytes
 Tests/test_imageops.py                        |  16 +++++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Tests/images/xmp_tags_orientation_exiftool.png b/Tests/images/xmp_tags_orientation_exiftool.png
index fb30199c86acbc8953d1cf16ddfa9e3ec41ece19..10f0f44009ae9237c1a5712ae8b0c7269b527711 100644
GIT binary patch
literal 1258
zcmbtUO=uHA6rN($novXq`-gO`;GVjFO|jV~DKV)grKy@mnu<!d$s}Ep{b6@YHUXiE
zmkJ^(6)6=w`GZg>=s}AL+KVR@ylDkNREki%i75Ie4RNh42p)E4-uJ%wX1=%ccJlDR
z!FpG-3n5e=jfCSclDVsH6THt0&mY22n+?W-2+dt^f0s5wOr;|67(%7J2u++t=o>&2
zpAZ`75Ly~RNW6+rgFf@%hz}B5^vJM@kb4JtYS8pdBSIUN<wVj-#`?vSrZ7@k8^w&R
z=)gwE*JJBaDu*p<6lZ1CPcP3urYSk?r-wRYTucw)F*#B)@L*{mkt*d<-Zb44aQSQz
z1QcvZl&$1dQ?&hbSyzNPfmxa=Q>>hyjw(_Xi(;=WXA+v0r+9(!cxVtY(it%xK2VW>
z$WM=1mM*evp-^B79gJpVS>EgQvYfyQLOU?p&7x{acDris0R<OT)(B%WWyrcEYbr%F
zrBQ9%^3$}7sz_tlx~i?3l@dTPSdw9RhGRjEqI@J2Lt0)l2B9iA!28M!Csd^!mTjC*
zhGhk-ChQ#Gxe9r8;?EVs>#cAkz!yu5IE?+fSxe5WW0qtbW=ROn6y3mP*+Hj|{R<<9
zFN22+8AItwkpmqSq7$nU<Ji>l<Airql`T@j^7>V9m7e^a2<#IoWG7f<4zI;@g8x-E
zxX)`}5nIw7MFW}`GO%Q62D!|E^2b(4NOdp*18!F{$oUBt)6#OL7?vy?5IEi=@|?(Z
zQCugPbakz)b8yx)vvMt<XP|r7Y7atC?P9D#>l)CbuW$7~h5p9Ta4^x>bn4=17usDH
zT3r0`vte^Cb2518`jfjiw?`gvp35)47H2=-Ug&G7ZR_g`-q`iNd)u*RCw8(;^K;YQ
zd#Q!D?rR@Ed}*yunypi9$0x50ox9&W*uV6q``sOWs(rcjMGfBC(%^no^pHPFw09sp
IyMN@&FNzYMoB#j-

delta 1598
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

diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py
index 95b49596e79..bd5f44e5008 100644
--- a/Tests/test_imageops.py
+++ b/Tests/test_imageops.py
@@ -345,18 +345,12 @@ def check(orientation_im):
                     check(orientation_im)
 
     # Orientation from "XML:com.adobe.xmp" info key
-    with Image.open("Tests/images/xmp_tags_orientation.png") as im:
-        assert im.getexif()[0x0112] == 3
-
-        transposed_im = ImageOps.exif_transpose(im)
-        assert 0x0112 not in transposed_im.getexif()
+    for suffix in ("", "_exiftool"):
+        with Image.open("Tests/images/xmp_tags_orientation" + suffix + ".png") as im:
+            assert im.getexif()[0x0112] == 3
 
-    # 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()
+            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

From bac83f7dd3ac738f8bc16a6647f69f373916ae2b Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 27 Jul 2022 22:27:43 +1000
Subject: [PATCH 2/2] Check that orientation is still absent after reloading
 Exif

---
 Tests/test_imageops.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py
index bd5f44e5008..01e40e6d4d5 100644
--- a/Tests/test_imageops.py
+++ b/Tests/test_imageops.py
@@ -352,6 +352,9 @@ def check(orientation_im):
             transposed_im = ImageOps.exif_transpose(im)
             assert 0x0112 not in transposed_im.getexif()
 
+            transposed_im._reload_exif()
+            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