From 1b70a4c6b5159135dcbfe21e5266fd9e38d949ac Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Fri, 13 Sep 2019 22:36:26 +1000
Subject: [PATCH] Use TIFF orientation

---
 Tests/images/g4_orientation_1.tif | Bin 0 -> 708 bytes
 Tests/images/g4_orientation_2.tif | Bin 0 -> 930 bytes
 Tests/images/g4_orientation_3.tif | Bin 0 -> 926 bytes
 Tests/images/g4_orientation_4.tif | Bin 0 -> 928 bytes
 Tests/images/g4_orientation_5.tif | Bin 0 -> 1026 bytes
 Tests/images/g4_orientation_6.tif | Bin 0 -> 1024 bytes
 Tests/images/g4_orientation_7.tif | Bin 0 -> 1022 bytes
 Tests/images/g4_orientation_8.tif | Bin 0 -> 1026 bytes
 Tests/test_file_libtiff.py        |   9 +++++++++
 src/PIL/TiffImagePlugin.py        |  19 +++++++++++++++++++
 10 files changed, 28 insertions(+)
 create mode 100755 Tests/images/g4_orientation_1.tif
 create mode 100755 Tests/images/g4_orientation_2.tif
 create mode 100755 Tests/images/g4_orientation_3.tif
 create mode 100755 Tests/images/g4_orientation_4.tif
 create mode 100755 Tests/images/g4_orientation_5.tif
 create mode 100755 Tests/images/g4_orientation_6.tif
 create mode 100755 Tests/images/g4_orientation_7.tif
 create mode 100755 Tests/images/g4_orientation_8.tif

diff --git a/Tests/images/g4_orientation_1.tif b/Tests/images/g4_orientation_1.tif
new file mode 100755
index 0000000000000000000000000000000000000000..8ab0f1d0d0204488f2e12f0872a4fdb12a7c28df
GIT binary patch
literal 708
zcmebD)M9wT$iVRbr<u2yJFjz_!-=&5K7DTKS%2Po%Jz7c`|Z&PeRciS>buroE>Aok
z92kBzyk78^)c5lHtJdxR`+N86iw`|EEKLXs5$Y`T+L*mLVn2uRLMAr14gmv)lMM$H
z5*jDBaWur-3{a@Me2AaJL~e%T|IA<h{yyq0m)|d#-+lSAzpveH{}VAa{eSvD>HO(F
z=l=hd>+^@~7aaGpNISBfa&~09;JDdY+5HxW`OCk5U#|B2zJJO5%eD4?Q?Hu)$Cun+
z^&_79%ly{AD*yM(3uN#6xPRaO?>F{_mwt_3-+uV-!~fO4zd3c^<l4MHMYH_tzkU48
ziit1z`1W1+|3>cMqz2_1_OHJKSra$pSF_jGujhTZVQb>9U;BR~K5Xj{uwQWa-|PF$
z4_>rc7r9#hnl#Zr&b#$w!HN#IO;KX|{{OJ!=lst8Z~pzZ4|jD}<o&yTeO7MTY|oM>
z`C0qs|Kq&JdH-8hqxHWxSF8W++q#c`^{)qiYybZDUHkRht^aq+qvKv)|F!G;x4o-d
zw;j55|8`<+HJi{4gDD2Pc~lOz?7xwy|0i5j$oYxRQCE-9x<z|`zq|U@{@eBSJURxm
z?wCmUf06pXb&G`GTa*8}E-sEu0twA5iU*t6I4nAvSp|XM|Ns9V7#ReBkb#kz0T{^)
zeoR0nlpO)&GeOxPIc6xE1;}QDvVlwnE+jRAj4WVtIDq0pNaCVMY%wSsWWG35{cWHH
zQjDx%y{mw3kcP510ogK0dNrVIpfH0WBNGD`klqF206_u}gWL(DJ&V#3^TIMy%NYP&
C1`cch

literal 0
HcmV?d00001

diff --git a/Tests/images/g4_orientation_2.tif b/Tests/images/g4_orientation_2.tif
new file mode 100755
index 0000000000000000000000000000000000000000..4ab0856411f878c246df96c0505ef7f3a6b20a3c
GIT binary patch
literal 930
zcmebD)M7Zq#K7?XXUwBBQ$5a1NG+PA?c#9eK~{WD@AJ(6VXJTRw!fSEd-vZ}&ys!Z
zL*DP+zf&Mo{G<H7ReQ_J-~YcJ8kaI5{LVGaFzty3Eo*`{Xo^XHaJX`&hndA8LBPP_
zBx6H|o(9hZhsH@93iZC<5AoWl2~;?~T<=@&Ys)ro-s~^Zua`An_V;&w(S7y)#JY~X
zPyA2pe-i(qb6ykgKEITV3yxa^a@q=jWWFQY568b|`?g-r_K%PEzf}Hxx#!*J<u8BL
z`>ucR*ZhZl^S{64Uu8>gD1Q9<@AbRgd%0f!U;CdszV*=mzqO9~5ed^ctAA|&u6gj$
zJ?GX>8vL)n{t^1g^XN6p-e3DysH|q=Oql-n`dyayysQiM*8Oi0Ke?MjM`7>JiJtmv
z1T|I9Hy<pB|NHkMS9G-oM@P^Xr|GX>);Fzde6T~mKL0h>wR_^+|GnQ$T($hR$JI=!
z^>Hai;r|_Hp8nVTMSef$>sLSgqwnAUf6M><+9m(juU}sp|88z|^t#vg4}1R2O<c0!
z)%C6aHym33#$Ym!K94q!>V`vcd%Nnj4sG-aoDpew)G%7~{jK<KTkHS7wZD+L>K1R}
z`nW^!%Y?aB7|e*~zTeEEWYE~e#wF0qA)&~|;o_#Gq@?`+|NjR}3<?Ya3=E9S42%p6
z41U0PW`wdMfP5w>8zjdJWwQX;Y*03k$-srAMv##OYz_xdTnI^A6p1YcWrNHYhpN8`
zv_OiH6|8p!&<)a1_68tZ21&05lnoSSFl1z6-~!S+KpY@Q0Ai3kVYFvaT4G*UW@<T&
e{Rgt16#sQFBm6f3$R^~!89+54kO0Kk{RaR*DGkd2

literal 0
HcmV?d00001

diff --git a/Tests/images/g4_orientation_3.tif b/Tests/images/g4_orientation_3.tif
new file mode 100755
index 0000000000000000000000000000000000000000..ca0d0fe29f200359b1bbcb4f4c53e97a491e36e4
GIT binary patch
literal 926
zcmebD)MD7j#K7?X|NqZQNwRH53Qh~0SDegP65-^fB4E67=0wZGEIa}hDF>T)1dJS+
z*gTY-tY!*?Tz_lw?hvo7eOz<>Azt>EEph^Ne@%aHd3$-^{}<hF|1?fgo-0^8iA!Z)
z$McIa|Mn`p{^hu(`9t#(=}Wx7fB5d-Yom5g^zxVgUrYaOt(&)Rf4uMhRoi{nzx`eJ
zM?Sv%;P>_a|99_yb&&ht8nHFv>$iT*$t{^JyYc&%e;;0cZ9n|~)_?X|*5(I)>;A22
zo^tIRn<V?X6SlQKrzXzY_aWWkY?U61<A?gc|9R}Ycx(**R;^#n8z#)3`1^Z(LGC?=
zruOFgzx8bYoLl!ufBlsC{uRI4yiKO__}~AEFIp2fPtaIgHR;#y`yamlsImVa`n5LP
z^!@(7-@j{YzjwjN?^DwMZ<GFsZ`sfNu=e`4^{=yTt(&?&`_^yI+V@-LZr#6s>l=f~
z&khzT7#!v_IOLYtk*Fr&o!GJ?v0CcCw7g7BwS4B+TiKaw*G`D3Pt^PEquX-r+U0Na
zKOD;DWfPN#j%VX^nRDV|GYgNPUcy0U7KMWxiTdInWn5f;z1m-Ux9Z>DukkBqYVW+E
zD7q;A^}pxLK|c#zCjDLY<#OE0`zr$W-dZ=I|K*VgCndxGKNuP~7z7v?7?~Lu85kJ+
zfN{(SWk&${Oi(sRjv2~k0kYYkY#@_?3rUS2BMaCZ4xqRYlDH@mTMWtunJ*4ie-&tf
z6eBBG?-HOJq@nCJK(-8$UJWQ4D9m8U$i%<}q_==LK#%~$Aa}xO&!V)%ys*sFavJ-O
e8E7Xd{%ZkhfcdWn$R^~!DIg1gAOVQ6`wsx!C=o#b

literal 0
HcmV?d00001

diff --git a/Tests/images/g4_orientation_4.tif b/Tests/images/g4_orientation_4.tif
new file mode 100755
index 0000000000000000000000000000000000000000..166381fb73f0e0dba385f9f39893be35f89bbdb1
GIT binary patch
literal 928
zcmebD)M7Zm#K7?X|NqY$4LLPhB7&lfSF}2`IGj5yl%=H5*OKATIKha8M<KmOLm{ED
zRqM>0o)ZH0ar0(4u39$hulj!u8->dsW;p&&w6EK>+-uhQOLhBPzn|FmBwl7Bi(irc
zP6hjn&h!78cwZ>oQTU^9i^Ke{6YuX|b#t9BIlg@TR^i|N`l`D1^{>|doBA^TmfzI-
zxBTD#`gL!cc<9#+dn>X&T>bAPwf|lFKh31cwJVm^d%r*QFn>9BeE#c$1rg>~#DB&A
zTqAGVyovwzNe|n<|Ne-xrf}4Hq`h3flILdl^%gM!pE`l~`~Nu;6}~5G|Jq;Im?2;r
z#2R1v`hqT#V&Y$>fBXNmXq<3eds6*`L;gEY`}+%`SmfqAtbY0bkDmBz?%&t{#|p&n
ze)Vtt|L6YaW~gnwR`UA&`qB^e?7y=Q{`XzK^=)<7?=5Td-(C8)Z{N15X1lIm&VJZ>
zBT=_aD6wfOW1EC$n~;r!5@X+uM19eXZ*r<dj$ii)pImx9^lE+S+qG*KT$9S)*Bm$N
zFgK5y*oDN>+wp7y%`6HBg*LSK9Bg9axR#P}tg-2vl5)r2{?+^Thu+`+`s)39g_N+a
zRcE=D6kOT=``y**+!M;L=D#)hduu<R?62i<O7{x|1upc||6@>KVh~_pU}R=sWME+M
z1I98VlpO)&GeOxPIc6xE1;}QDvVlwnE+jRAj4WVtIDq0pNaCVMY%wSsWWG35{dJ%P
zQjDx%y~}`ZkcP6?0ogK0dNrVIpfH0WBNGD`klqI306_u}gWL(DJ&V#3^TIMy%W3RC
cP<W8yzcyxs|N4MzLjIcuR09GDK#bjg0791xpa1{>

literal 0
HcmV?d00001

diff --git a/Tests/images/g4_orientation_5.tif b/Tests/images/g4_orientation_5.tif
new file mode 100755
index 0000000000000000000000000000000000000000..9fecaad65c3f7abeaf985dc27277c385f4f387f1
GIT binary patch
literal 1026
zcmebD)M8L#W?+~rC@XkP`9BCu2xa>JUwsdltx?eNO3B`eY5o73e!)|o@&!C`JXJJj
zxh9a%=;+wsq@<+mHC2Dr|L@=P6|S*--}}Ue$NgW4@`39>-5vizc1p>}C_KFEH~0G@
zi^M(Z{BK{{{{8#^_y51Y>wdj^owrSPeb?@=d2%Ao0jYdkK--bDu9T9oaJ*|GYyIA(
z;BbYX{OwECzkmP#{{Q#4zhCcOyPIPjFIu+N#zv!U;S@`!NA~~!E2b+&C={%`YT=t*
z<x;+2h54$l`{Sn8|NsBDG(PUj{=eFpESm(MUQkU^;xFGL7nT9E&2#?0;I^&o{+B_1
z(kM!v^3)RKOH2Qbjz>yLO7j2zKeF>;a}QGEapG%kdHEzly|3x;rQ6qj-P`*bXz>64
zd-H!^x_|r74I9<u)mLB1uCUS6a+aT}=hn{7VNr5<dF_iniG0q(zpMP~>+Aph|6g~1
z-|k(v*S2RrT6cAMd#k_|N#~}HPd@)Y%`shJRW}c0wew^daOeVw8W(p#K|ukaHG=>D
z16BRY=3RAdU&oJGSF8U2|LM1*x2flad*gbrJSc{Mv4a;0%DNzc`=<aStBD3l0wpr)
z{z?aJO2p)*-P?Zc>-%Vszy7|izc=mQJ+XriwPoYh2fTHB=ousdl0XFw91IN%0t^g{
z%nXbS3=9!K%m`)sF)=VOLD?WVW+<Bl$Yz7GflLN2BsGGJEMRjufZ{?(;-W}wF(?~k
zzBp99C6Fz}$O_R5Ov}<xwg8YVgQQmj$_6TDFl1z6-~!STKs6wc0K_17!f4N;w8Xry
k%+zuk`;Qf9Cn^4W0dz0Se;<HsLjL;!R09GDK#bjg0QUM#LI3~&

literal 0
HcmV?d00001

diff --git a/Tests/images/g4_orientation_6.tif b/Tests/images/g4_orientation_6.tif
new file mode 100755
index 0000000000000000000000000000000000000000..6abc001ebc16f2ddfae342f5d38d5d0845abbe30
GIT binary patch
literal 1024
zcmebD)M8LzW?=Y_0aUYGS!@p-ZuQ$9y-4|8W8$ue+PZD8f87Tud>{RFZ~5B2+Wg!-
zeR2}3!$b_0!~|J&{3~%OamSA$I^dxH|Koop$_K6k&FeVV)%e*Zw#5Gb@9#GzWHY_5
zK56{_$N&F7)lwb*|NnEPd(lge7rXSj7XgW;3t$u8R);N_`Ty~WAmtTKK0dvU77-=a
zR{oUT#WmmS*Xnh@;;;W-|Nr{eZChU!T+!{~EZrJ5BjC`AL;WYCCOYyLY<L*F_S%b%
z-wPu0rpd>z-Suxf$XCCw{mqYko$qz{&|~HHHm$3zJeuMneT(coX9m>&|8J`FVpotA
z#0}jGwkUysb==jJYV|;e{tL^Law#~~Vs$;lr73xeg^rjy*W|?g+y6(`{d@oW|Np<c
zfB(K-expq2w(P6Rhqv-wact`U|Nlgk@(M+E<p4i1S<_W@?s-kiFYR0Pdf)V~|6l+A
z`ZsrNRg5WjQd4Yh=(2^aTn2%EUbr`|2f9-bh!s8h7IGRInX)`gyd1UsN!bgnTJ2Zs
zcE7BT|F{2t{Iy%xmmUt-rlET6YE+^#*J3XFxf~x%f!ZF~e^Tjq5XVuvHhbb4)%END
zet&y=yA?QCHHs9TTKWY~0TKaHf?!bpUw*Ejtl%|epw9pQCxkNn|F6CW%+@IAc%@{(
z$RHrVz`)4Nz{tSB5CO!DP_`cv0|OJ34U%JqvRQy^HYgj&WZ*(lBgn`CHirW!E`%g5
zio_O!vO(sHL)BXV*;0(GV7+X>lq?Np^8wj1NP0D(Y@l)mLq;YBE+8!iR09GDKn!vx
tjP@)_OUw()Of6@it^e47c9P=1XF&JD{PzyXCgi_wKs6wc0L0k+2LOtQPon?;

literal 0
HcmV?d00001

diff --git a/Tests/images/g4_orientation_7.tif b/Tests/images/g4_orientation_7.tif
new file mode 100755
index 0000000000000000000000000000000000000000..0babc91083fa17d380aa945763fbf8ab38db74d7
GIT binary patch
literal 1022
zcmebD)MAihW?=Y_0TjAiOI$>_`8K?~o3|<Ng^u*0+rKZ}|GpNa@ZZ<{(bubPU)u0t
zn$r42=YT`a8bumA`k!zLUX;a;l9b@U{(t{ZCbrE-f#!9bd$C~7TBX-O_OGuK6hePp
z6Im<&|M>s^C!4kS|NsARdeMtrdfkg&D78;_y;#}-24#C!2W_eU@ky`amCKO@XEh?K
zcV%9b{cDjQ_O<+a-TnRl|L@<wfA7-mAKvJ;9gY4So+ZVjQP_V%X=1D(E7RdMR^`!a
zX7A!=`>^fbm+gOF*8^Sge{cS^ulKfnS!1KxvHC{96@!3OJ}%`a2dA?C|NkTPVo9vH
z>%|g5XOLr#xPX9l+|`v)_J4qS6~de~yc`#BeXlT5c*^G|EA+#bW%8x>e|7)A)Y}g<
zd41Gf{m>0pRJ*+X&DzR!MMOfe|Ns9Jo0L~5vOCTS*zmpN@*?YB1^3pzdcW@PexP~v
z_4U=>`44YI^LB0jw$_wSLc`+tCl=oHZlGC$K&<qlZ;6i=&!yJ(-OJ_*-oM=TH9x$z
z{O#}m|9=C)t>}8bLpO3l_irs*xZqH`#6O3|H6MYdKC=JB!g}JhK=r-v+RWSQ>;Er(
z8MIU(101xw^g131g8g`v1025l|M#E!2#m}md!T*)Ke2G_|Np!KXb6zq&e69>nL&V&
zL4bjQk(q&!fq@|ch#8@5KPCnSCMX*u#|&k&0NHF%Hjv4{g``H1kp*lH2T)uHNn8|(
zEe2(S%om5MHwCh#7+Jx3S%B$S8p`GYvSpC;YCzdQ<qU?5OblE=S_G&D1QLK4<W3mv
qS(KKT7nYe?PGkSE1MMWme@}q!h57FdkWI*cUw~>rAOVQ6`wsvMCR6tS

literal 0
HcmV?d00001

diff --git a/Tests/images/g4_orientation_8.tif b/Tests/images/g4_orientation_8.tif
new file mode 100755
index 0000000000000000000000000000000000000000..3216a37257714c434f5daec635e17474aefa19cd
GIT binary patch
literal 1026
zcmebD)M8L#W?-26NO_Ufk^28Y@PtFO{{OiTAm;z4e1ftr?jVtWr;6q**8~y^Pc%<?
zYUvleqNAf@j-jC7_PqPs|9}0uRKel;+U!WC$4wpoPY9UK)BpefkNYQWrzw2G99GLO
zFTLQ=Cnw5&>Fctuf9vD_|E>4lw{G>W*cD#KZ)Jz_a~+ZtcPSMFTBzV~tz!TG{~zT~
zY-iQb2xz?QzubGlL>U_`{-v*dU;p~I|NpOl(`#eHOLhlL?cZ{3m7HjcK`I}Y^8f#z
zGzuI}UbV0)_%^qu?{<lB+wXmAf8W3V|Nr;D+y8H0|GPFKckM)WjS3xsj#aNCc@}C;
za|deLQvXwmx2oi?O)uPkCwKY<x3(xLDOq%Y{BY7sxtm4dA#=+Mt0yt)d`*W-wtd~V
zeSH<s<p2NQ$6wuBx1%adjx$c{Yu0)$Igv=$WD<S-G~@p#6R9sRe^p9@0~Sa)PX-1y
zH;0RhOCc~&e)RwUKXvi{pG<6bY~P={I8VL~=<vCPa=dO1jcY#E|NsBU9vo*HMeX=d
zLB}hgr(nQ-(iC?w4v#{EX5u{t@-Yhd$DqI@z`(%B%)rRNzz_k%j8L{869WSilns(&
zhO$|JY&Iwx$YkI`QX|O70yc*OC@zE~E{en!gR(*9i$m300ohWFtPs7xv@8u}3jo<N
zNP0D(Y@l)mLq;YBE+8!dR09GDKn!vxjP@)_OUw()Of6@it^YuNCB=U)fbNC)?*ouc
Q$bUb8YCs?Xh_U+*06SSjX#fBK

literal 0
HcmV?d00001

diff --git a/Tests/test_file_libtiff.py b/Tests/test_file_libtiff.py
index 6339d878a..41d5dae7e 100644
--- a/Tests/test_file_libtiff.py
+++ b/Tests/test_file_libtiff.py
@@ -831,3 +831,12 @@ class TestFileLibTiff(LibTiffTestCase):
         self.assert_image_equal_tofile(
             im, "Tests/images/old-style-jpeg-compression.png"
         )
+
+    def test_orientation(self):
+        base_im = Image.open("Tests/images/g4_orientation_1.tif")
+
+        for i in range(2, 9):
+            im = Image.open("Tests/images/g4_orientation_" + str(i) + ".tif")
+            im.load()
+
+            self.assert_image_similar(base_im, im, 0.7)
diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py
index bb86c53aa..b2d78cfd5 100644
--- a/src/PIL/TiffImagePlugin.py
+++ b/src/PIL/TiffImagePlugin.py
@@ -1098,6 +1098,20 @@ class TiffImageFile(ImageFile.ImageFile):
         return super(TiffImageFile, self).load()
 
     def load_end(self):
+        if self._tile_orientation:
+            method = {
+                2: Image.FLIP_LEFT_RIGHT,
+                3: Image.ROTATE_180,
+                4: Image.FLIP_TOP_BOTTOM,
+                5: Image.TRANSPOSE,
+                6: Image.ROTATE_270,
+                7: Image.TRANSVERSE,
+                8: Image.ROTATE_90,
+            }.get(self._tile_orientation)
+            if method is not None:
+                self.im = self.im.transpose(method)
+                self._size = self.im.size
+
         # allow closing if we're on the first frame, there's no next
         # This is the ImageFile.load path only, libtiff specific below.
         if not self._is_animated:
@@ -1181,6 +1195,9 @@ class TiffImageFile(ImageFile.ImageFile):
 
         self.tile = []
         self.readonly = 0
+
+        self.load_end()
+
         # libtiff closed the fp in a, we need to close self.fp, if possible
         if self._exclusive_fp and not self._is_animated:
             self.fp.close()
@@ -1388,6 +1405,8 @@ class TiffImageFile(ImageFile.ImageFile):
             palette = [o8(b // 256) for b in self.tag_v2[COLORMAP]]
             self.palette = ImagePalette.raw("RGB;L", b"".join(palette))
 
+        self._tile_orientation = self.tag_v2.get(0x0112)
+
     def _close__fp(self):
         try:
             if self.__fp != self.fp: