From 8d3014b8bf94ee6d07276b227dfac4d6f7f5a859 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 15 Apr 2023 21:03:59 +1000
Subject: [PATCH] Added inPlace argument to exif_transpose()

---
 Tests/images/orientation_rectangle.jpg | Bin 0 -> 669 bytes
 Tests/test_imageops.py                 |  12 ++++++
 src/PIL/ImageOps.py                    |  51 +++++++++++++++----------
 3 files changed, 42 insertions(+), 21 deletions(-)
 create mode 100644 Tests/images/orientation_rectangle.jpg

diff --git a/Tests/images/orientation_rectangle.jpg b/Tests/images/orientation_rectangle.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..85cfbd0a813a1b36d64318ead4f0fe5a3258a51f
GIT binary patch
literal 669
zcmex=<NpH&0WUXCHwH#V1_nkTWcdG(LCLiuGmU}4*Ox(yfq{VoC?~|g3}i6^*<kSh
zHiI(*2OAqZ8!HDpJ3A*Q2N#bBFAq02kED<=zlf}qyqv6*jEsVcp1OjPj<Sr5hPkGW
zfuV_siM+a{t%Z?|p0SA$$Ph+OPEH<f9tmDv2_r=rMI(~I{{swyKnF4~F*7PLFbOg;
z3o`yc!XOWHD=Q-yKpYI@GcmKUvaxe;a&ZF{Y!zT&Vq|7!Vqs=wWnlrz)&k`jSOi&x
z6b&8OgaZ@Vl?p|S8YeE~P<GmQP&DY`2NmO_q9#r*F>wh=DOELf4NWZ*Q!{f5ODks=
zS2uSLPp{yR(6I1`$f)F$)U@=B%&g*)(z5c3%Btp;*0%PJ&aO$5r%atTea6gLixw|g
zx@`H1m8&*w-m-Pu_8mKS9XfpE=&|D`PM*4S`O4L6*Kgds_3+W-Cr_U}fAR9w$4{TX
zeEs(Q$Io9Ne=#yJL%anfAwEO%mmttzOe`$SEbJhEF*22dJTAz>s%Xe2<QT}FSSYMy
z)W{*?G;!g^gPh97K_5huiY{`AshB)e{Rr|J*k{Cftcfh2!99lX*DVGfW?&2oG7B=;
RGdy~+sO#tC@529Y0sw<;)eryx

literal 0
HcmV?d00001

diff --git a/Tests/test_imageops.py b/Tests/test_imageops.py
index d390f3c1e..e7d04cceb 100644
--- a/Tests/test_imageops.py
+++ b/Tests/test_imageops.py
@@ -404,6 +404,18 @@ def test_exif_transpose():
     assert 0x0112 not in transposed_im.getexif()
 
 
+def test_exif_transpose_inplace():
+    with Image.open("Tests/images/orientation_rectangle.jpg") as im:
+        assert im.size == (2, 1)
+        assert im.getexif()[0x0112] == 8
+        expected = im.rotate(90, expand=True)
+
+        ImageOps.exif_transpose(im, inPlace=True)
+        assert im.size == (1, 2)
+        assert 0x0112 not in im.getexif()
+        assert_image_equal(im, expected)
+
+
 def test_autocontrast_cutoff():
     # Test the cutoff argument of autocontrast
     with Image.open("Tests/images/bw_gradient.png") as img:
diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py
index 301c593c7..460a21ce2 100644
--- a/src/PIL/ImageOps.py
+++ b/src/PIL/ImageOps.py
@@ -576,19 +576,20 @@ def solarize(image, threshold=128):
     return _lut(image, lut)
 
 
-def exif_transpose(image):
+def exif_transpose(image, inPlace=False):
     """
-    If an image has an EXIF Orientation tag, other than 1, return a new image
-    that is transposed accordingly. The new image will have the orientation
-    data removed.
-
-    Otherwise, return a copy of the image.
+    If an image has an EXIF Orientation tag, other than 1, transpose the image
+    accordingly, and remove the orientation data.
 
     :param image: The image to transpose.
-    :return: An image.
+    :param inPlace: Boolean.
+        If ``True``, the original image is modified in-place, and ``None`` is returned.
+        If ``False`` (default), a new :py:class:`~PIL.Image.Image` object is returned
+        with the transposition applied. If there is no transposition, a copy of the
+        image will be returned.
     """
-    exif = image.getexif()
-    orientation = exif.get(0x0112)
+    image_exif = image.getexif()
+    orientation = image_exif.get(0x0112)
     method = {
         2: Image.Transpose.FLIP_LEFT_RIGHT,
         3: Image.Transpose.ROTATE_180,
@@ -600,22 +601,30 @@ def exif_transpose(image):
     }.get(orientation)
     if method is not None:
         transposed_image = image.transpose(method)
-        transposed_exif = transposed_image.getexif()
-        if 0x0112 in transposed_exif:
-            del transposed_exif[0x0112]
-            if "exif" in transposed_image.info:
-                transposed_image.info["exif"] = transposed_exif.tobytes()
-            elif "Raw profile type exif" in transposed_image.info:
-                transposed_image.info[
-                    "Raw profile type exif"
-                ] = transposed_exif.tobytes().hex()
-            elif "XML:com.adobe.xmp" in transposed_image.info:
+        if inPlace:
+            image.im = transposed_image.im
+            image.pyaccess = None
+            image._size = transposed_image._size
+        exif_image = image if inPlace else transposed_image
+
+        exif = exif_image.getexif()
+        if 0x0112 in exif:
+            del exif[0x0112]
+            if "exif" in exif_image.info:
+                exif_image.info["exif"] = exif.tobytes()
+            elif "Raw profile type exif" in exif_image.info:
+                exif_image.info["Raw profile type exif"] = exif.tobytes().hex()
+            elif "XML:com.adobe.xmp" in exif_image.info:
                 for pattern in (
                     r'tiff:Orientation="([0-9])"',
                     r"<tiff:Orientation>([0-9])</tiff:Orientation>",
                 ):
-                    transposed_image.info["XML:com.adobe.xmp"] = re.sub(
-                        pattern, "", transposed_image.info["XML:com.adobe.xmp"]
+                    exif_image.info["XML:com.adobe.xmp"] = re.sub(
+                        pattern, "", exif_image.info["XML:com.adobe.xmp"]
                     )
+        if inPlace:
+            return
         return transposed_image
+    if inPlace:
+        return
     return image.copy()