From dc714be93496cb3fd80805f4414b7e0cf2e88ddd Mon Sep 17 00:00:00 2001
From: Roland Busa <airbusa@tutamail.com>
Date: Mon, 12 Oct 2026 09:51:43 +0200
Subject: [PATCH] heif: apply all rotation and mirror combinations

read_orientation_helper() mapped the irot/imir properties to an EXIF
orientation with a list of conditions that misses several combinations,
e.g. a 90 degrees counterclockwise rotation followed by a mirroring,
which is how iPhone front-camera photos are stored. For those it still
returned true, so libheif was told to ignore the transformations while
Qt got no orientation either, and the image was shown sideways.

The orientation is now chosen by a switch on the rotation and, in each
case, on the mirroring, which is applied after the rotation as MIAF
requires. Other rotation values are left to libheif.

The new read tests cover the twelve rotation and mirroring combinations,
named like the AVIF ones. All of them display the same picture (colored
corners and an "F"): the stored pixels are that picture with the
transformations undone, written as uncompressed HEIF with libheif. Four
of them fail without this change.
---
 autotests/read/heif/rotated090.heif           | Bin 0 -> 4868 bytes
 autotests/read/heif/rotated090.png            | Bin 0 -> 167 bytes
 .../read/heif/rotated090_left-to-right.heif   | Bin 0 -> 4878 bytes
 .../read/heif/rotated090_left-to-right.png    | Bin 0 -> 167 bytes
 .../read/heif/rotated090_top-to-bottom.heif   | Bin 0 -> 4878 bytes
 .../read/heif/rotated090_top-to-bottom.png    | Bin 0 -> 167 bytes
 autotests/read/heif/rotated180.heif           | Bin 0 -> 4868 bytes
 autotests/read/heif/rotated180.png            | Bin 0 -> 167 bytes
 .../read/heif/rotated180_left-to-right.heif   | Bin 0 -> 4878 bytes
 .../read/heif/rotated180_left-to-right.png    | Bin 0 -> 167 bytes
 .../read/heif/rotated180_top-to-bottom.heif   | Bin 0 -> 4878 bytes
 .../read/heif/rotated180_top-to-bottom.png    | Bin 0 -> 167 bytes
 autotests/read/heif/rotated270.heif           | Bin 0 -> 4868 bytes
 autotests/read/heif/rotated270.png            | Bin 0 -> 167 bytes
 .../read/heif/rotated270_left-to-right.heif   | Bin 0 -> 4878 bytes
 .../read/heif/rotated270_left-to-right.png    | Bin 0 -> 167 bytes
 .../read/heif/rotated270_top-to-bottom.heif   | Bin 0 -> 4878 bytes
 .../read/heif/rotated270_top-to-bottom.png    | Bin 0 -> 167 bytes
 autotests/read/heif/unrotated.heif            | Bin 0 -> 4858 bytes
 autotests/read/heif/unrotated.png             | Bin 0 -> 167 bytes
 .../read/heif/unrotated_left-to-right.heif    | Bin 0 -> 4868 bytes
 .../read/heif/unrotated_left-to-right.png     | Bin 0 -> 167 bytes
 .../read/heif/unrotated_top-to-bottom.heif    | Bin 0 -> 4868 bytes
 .../read/heif/unrotated_top-to-bottom.png     | Bin 0 -> 167 bytes
 src/imageformats/heif.cpp                     |  77 ++++++++++++++----
 25 files changed, 61 insertions(+), 16 deletions(-)
 create mode 100644 autotests/read/heif/rotated090.heif
 create mode 100644 autotests/read/heif/rotated090.png
 create mode 100644 autotests/read/heif/rotated090_left-to-right.heif
 create mode 100644 autotests/read/heif/rotated090_left-to-right.png
 create mode 100644 autotests/read/heif/rotated090_top-to-bottom.heif
 create mode 100644 autotests/read/heif/rotated090_top-to-bottom.png
 create mode 100644 autotests/read/heif/rotated180.heif
 create mode 100644 autotests/read/heif/rotated180.png
 create mode 100644 autotests/read/heif/rotated180_left-to-right.heif
 create mode 100644 autotests/read/heif/rotated180_left-to-right.png
 create mode 100644 autotests/read/heif/rotated180_top-to-bottom.heif
 create mode 100644 autotests/read/heif/rotated180_top-to-bottom.png
 create mode 100644 autotests/read/heif/rotated270.heif
 create mode 100644 autotests/read/heif/rotated270.png
 create mode 100644 autotests/read/heif/rotated270_left-to-right.heif
 create mode 100644 autotests/read/heif/rotated270_left-to-right.png
 create mode 100644 autotests/read/heif/rotated270_top-to-bottom.heif
 create mode 100644 autotests/read/heif/rotated270_top-to-bottom.png
 create mode 100644 autotests/read/heif/unrotated.heif
 create mode 100644 autotests/read/heif/unrotated.png
 create mode 100644 autotests/read/heif/unrotated_left-to-right.heif
 create mode 100644 autotests/read/heif/unrotated_left-to-right.png
 create mode 100644 autotests/read/heif/unrotated_top-to-bottom.heif
 create mode 100644 autotests/read/heif/unrotated_top-to-bottom.png

diff --git a/autotests/read/heif/rotated090.heif b/autotests/read/heif/rotated090.heif
new file mode 100644
index 0000000000000000000000000000000000000000..428c95628ecd3ec685c2865a9063dd7c2c64d4b8
GIT binary patch
literal 4868
zcmeHHOHRWu5S`L4!ltSa2$n!E0OA5jz(GPjWu&^Xf{|be;vgK3dxSR$t-Qz}_p?B%
zC${Fz%gjss6orV+O7~_Bm)C@lY&b0ezfIv%;Sd*3`MmBRk>$)S@iJfXyvn4wzoh{#
z#9-8Aq9ZA%%nOml4eS#X#ldg&vdCEA*s?PM+LoMcZGj)yW)<=TZFe$T&mM1(j``UZ
z$P(w+SJ)HFudUQDNfOkDTvtwJPT86iSpx4jdjA-H;>8k^r#MT~yP9>QS4Ex}^;;_y
zBNTdF_nUr~qyH--cV_fTF@oqobl~4PApg8gBjhlfYRlX{=xb;6ee-)X-tP&)nvTYY
zX!<>xj>h}5Az0JV_z+FMN7K=Ge>MbbIvO9M>Gx<l8t>0;gQNa7?#0>Yz&<!YU(~yH
Ub@pCykWs&LAo}z7m!SFc1GUJ-@c;k-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated090.png b/autotests/read/heif/rotated090.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated090_left-to-right.heif b/autotests/read/heif/rotated090_left-to-right.heif
new file mode 100644
index 0000000000000000000000000000000000000000..9730c664f98c078af86f9c11d5a0bd663b41f37d
GIT binary patch
literal 4878
zcmeH|-%7(U6vodSLU%KUDC|<*3ru_gL9cy>+O>LMX+w>mmx{iJPv|Su@3fojA{h&8
zpzfSDJ%5sXO@4%yh{lC`v4)Eaf{8br76`vg?oz42&K_p-x(kUcXKooU{W;I8Op==`
z>fwU*hMgxml61mciYz+NPLSjWi|nb)Si+%YXC!Eclx%B@_?B%}!H+QPTISaGcb9O-
z{AhD{u~W1u+Q{;AE7ebu1o?pL%E_Do8?Gf7vo$Ha7#4c?`qqE{z!DQPOI@=iqfheQ
zTas_Q;wY+qM?m?kKMA|$v;OVcs|5Zlf%d<$c<f@2e?>pE&QLv;RY)gPSN)E_zVTVz
zZ*08DnTge09lsCyo9t1?C;=t#8we0J-aC42UKRQFsea2c03uM1#_y-B{C_|OKz{?D
C2FO|f

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated090_left-to-right.png b/autotests/read/heif/rotated090_left-to-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated090_top-to-bottom.heif b/autotests/read/heif/rotated090_top-to-bottom.heif
new file mode 100644
index 0000000000000000000000000000000000000000..f935db409eb95df8d09e3999fbe01fbf3bec1f06
GIT binary patch
literal 4878
zcmeH|T}s3-5XWa-gzn3-h{8VlaRJ2(2>R?DYPZ#aO*_;G`l#qVJfT-u|I@h8heqsD
zQFNwB=Of9#$&WyZXkPdSaa^1bOugf@K=|fzpK1+uaI;v}AtVyc{5oFyLta*yCKqQk
z!UG#kgD2Y2^oY4sSqz}>A<4Hsvb!>44X481Y0yk5S!zLi$&yv@GfX?zwe|JYDcmmK
zN)E5KkA93k6TWYx#z~SOpKx7yT{B_F%>m{tE=55N8{K|<8b7~ai-}vLenr&XR{bn0
z6CE&p1>X%{2l`nQb9BJ;8~*(;*lZ(U1b#Jv@T1%8{gs1lrW{uNH~sc`+uYjqzHv+^
wRyX}X!1xTyA$G5Z;`~$kvF}>l2>d+)^h%v=sFQYzqiFhpfbseKCVV%acgY>dSpWb4

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated090_top-to-bottom.png b/autotests/read/heif/rotated090_top-to-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated180.heif b/autotests/read/heif/rotated180.heif
new file mode 100644
index 0000000000000000000000000000000000000000..9d899607be9262ac330161b976da36cb7dc7e3a9
GIT binary patch
literal 4868
zcmeHJT}lHn5T4pTtS?eT(MPoxsCWTEJ;=I0I?!~(8bKcw58~mxN1f@mArDEql#oTt
zbkq4VGoA0_D}@5Ud9B{1!1@{}I19{cf<K~CIoBvIpUXwtK>&$`+Tv}#!bMZ?<^C2%
z^r9F|x(sm4*BRoH*HVMdDP5|A&FytrAj2bxN-$WDlqg$C_yJ|nP@dA*9e=icdc2`@
zf-kb7%rU2PL1!xQZM|xoWf|QMv27I7oS_ssWe(Ce`S=`vk+4jZxmpbr04wV=kQ}=h
zQaDst%}ILn*YQ97>3+lAySBm#;`sA-^;k^{UhMBraBAzqq{nKDE+&7hR+zSEtS93D
z&FcbjWM~$b3|-fgae(G^fjBb!ET%U9WSnl&<M%nfKPICe`;~|4`Zbu{{TSgJtdDD(
u$>_(f4V${-5295J6<yo>8qBV1Ls&gKSo*gE`O}|p$7IsuHz@hDmp{L~O2zU3

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated180.png b/autotests/read/heif/rotated180.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated180_left-to-right.heif b/autotests/read/heif/rotated180_left-to-right.heif
new file mode 100644
index 0000000000000000000000000000000000000000..08a495f4dc51df6cf1aee034557157ea92394615
GIT binary patch
literal 4878
zcmeHKT}s115Z+pZ^raM0=%YUusCWTEpS?p&6CLO#ON^k8ir&K$dWHH;V@n{jiwOyl
zveRs5=9}G_FJD?{l~VJhcr}`mO9f-EDNGQ4>$nIRgPlDtS9uvKWhg4P@z$TyDvLO|
zy;dW<V54d2l{(_|f+*#-C}5o+i4T6W=QJV?r-lm6!DdTJCO3%h$V3_Z4BKw_Z2oY6
z1$RtOCWdEQV4Y&k483exje{USKA}7-c+7+}<$QQfMu+fhAbR-rKK}Rw#Xv7Z+|^pV
z)&rSH2H;TU`M8z$`t+es`DHEN-Tj+Z+dZ%T_%!8T?)QA$x_N!PK5hlv)#~R*jNQjO
zuZkS1VCNIv4XdNY*nPb7s>q=Vc0SSFaKO<bG0#VoWe5IeeX88*@$MFS4eE1kNMjnU
tevsLw*Kr#k^`*p1{x=AcPOHzgA+|Om8G!Bh*rxm)_k7%1d42XnpC2Q@$Xfsa

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated180_left-to-right.png b/autotests/read/heif/rotated180_left-to-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated180_top-to-bottom.heif b/autotests/read/heif/rotated180_top-to-bottom.heif
new file mode 100644
index 0000000000000000000000000000000000000000..70c4fdb8e61df7cc525d82a59f95318031e74d6b
GIT binary patch
literal 4878
zcmeHJT}s115T06u^raM0=%YUuP`rSk&)y-Xi4Js=C9a^4ir&K$dWAZZwsarHVJ+KQ
zVJBJUH#6UUn?L|yT)7u(u(|*e)&}#6%r8^AoMR*>50hy-HvudbZfP&|DNdV$otrD@
z(M8f5&NaXRyJv_sx1|KFBXY{Uh4)k!$mY<ZGi-DvHQLsaeT%keNRO!OnxAd&?=DFl
z;-f7|vz*g9rZuwo+_mawSw{W<+s5&j0UGQ!Fh*-~3a}8+{nxkt`v*bH%p`a43F1B5
zv;fScTLeSFO~VnvP%z<HFfSce;%D_*M&gG*(lA+#7Oj7RN5rlK!?@uprAfrpuHn(Q
z=A+dsx06kHbe{i^AAhuH>&T;LMGSs0`b52<KU%c)$D?OO41O^B#5EcwJUVHKpTv*O
jfSwJ1e}4Eq)Z70$yK8vDH?SRk5}t4d^vZNz>+$mqX-3Fe

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated180_top-to-bottom.png b/autotests/read/heif/rotated180_top-to-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated270.heif b/autotests/read/heif/rotated270.heif
new file mode 100644
index 0000000000000000000000000000000000000000..c93e65ed9ff8e8340b0fdc8e30f8a4887b0038fc
GIT binary patch
literal 4868
zcmeHIOHRZv4E4}ilnojo5G?sz0K^55fP<8N21}D^RDuLc5C`FK+@n0VGg22x)uJx=
z*p2IF$9-~M7A2zN!o66-#U;Tc8cqtpPm{YuYOvFXY*n?8$a3nocpJ}nRi={MUegQ@
zY&LHr(Y~bT%xj^=2K*37zO%`m)+r0zv+Rt3rX^!rS>QXiX^FT%+l_o%E$^=o4*1dL
zh+-%33;4qFb3+xyag2PItI|aPM{G@kD2DmwuW!*i28&IWIQk&(swXlpIf@g}*UI0o
zr0UbJkM61hsz6tP<~Ol<b?Z~%zsf(=xk5al`q+C3@r3Hi-zxAM_36$$1P{6EAv~d;
n|G+=wjM}3Lr~*Gi0ixQwMh@rYK+#Vw8{<s*`}I<NzNgO@uQJ8+

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated270.png b/autotests/read/heif/rotated270.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated270_left-to-right.heif b/autotests/read/heif/rotated270_left-to-right.heif
new file mode 100644
index 0000000000000000000000000000000000000000..192b3b532f9625501bb85bf70099370115a10c20
GIT binary patch
literal 4878
zcmeH|UrNL<5XNUMLVZ~lQP@XyFQ9k<L7%-t?Y8c~rVTNIJ}P<-Pv{laZyFc+(1=|s
ziaXP!^C!vI<VT=HG%fw3HC&z%OuXT&MEGtBpGggNyqGUt2#GA`ejTs<2`}qhlB)|E
z;en0D!4vIEI%BRx76a&qNQ#}$?7qrb!m(v<Bxt5oY@J1X%{H&$Czy6AYu)Y5Iotu?
z*#chd2>ld&V)>zwO42k%zQ?ZiNfQ`$vUtkYWbk6x=<d^V^74u;re>b`6;XFv^|Po<
zbU^h5d^da<=x0&P(E-(O`1ix0vz34n_|pW!k8ZQ~cMi6ha#*!(`t9?!xwY$k<CspY
vuKIz1@)?#x>|PDU`M30A-_^Pj_<scGjXK*<C+!qRQS}1><@5DT_-Q^L|B}dD

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated270_left-to-right.png b/autotests/read/heif/rotated270_left-to-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated270_top-to-bottom.heif b/autotests/read/heif/rotated270_top-to-bottom.heif
new file mode 100644
index 0000000000000000000000000000000000000000..46df7704456cc3293718873388d7afde75b46af2
GIT binary patch
literal 4878
zcmeH|-AcnS6vxjjLcJM76n5#y3n;#Tpx3@b?OJzWX+w>mmx{iJPv|Su|4BF5MKV^{
zK;1b_dOni=oBRkZ5sgdtVhxv<1QTyKD-nK~!evr}olYmSrVEKI=WY=%{29;cT$0;s
z8sLHrhMgxml=Pgr5?KtOA0sLD=Gjw~vxGy-&Pd>=RBRiI_>OH}!;diSMxJdR?yumE
z_|X>dVkhVq=p)O|UMfk`6!`%+wM%?p*l%FW)?_G%VWIo4Z^`=ymYAAJ=GqMzeNwP(
zNWKk<qp12F0p+v$By5|{>bL8t68NtK{C{PB+r}RMihgXJv3g%tF`Zal^*aK)#%FoI
zedBe`Okd6A`MaRM&K`A+5>NuafdEk(Y`xbORFQ9=>U)+E5Rr0k{9($<{|96Q^f$3N
B$Xfsa

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/rotated270_top-to-bottom.png b/autotests/read/heif/rotated270_top-to-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/unrotated.heif b/autotests/read/heif/unrotated.heif
new file mode 100644
index 0000000000000000000000000000000000000000..2fdfe17a0e4340b104817c2ad44574846081d75f
GIT binary patch
literal 4858
zcmeHK%}&EG3^w%A6PhMK9Qk<x5LXUJ@D$ui*Mg;Gvr3TQ2v5Ru@hDt|-K|p&o;7VL
zKT_O8{_G^qmoM$10B}_MS8`Zi0GoJ+Ma}TjRlblM+sWf-+{_^WVd*>E`BNNEO9^hT
zVTT{FuZ4%9L}!Q-DGP1(fP-px5j{^z6u3v|oq%@A9a2M#uaL?q`vFh8k;=`({Uy77
ze4>iI*g5xO?gPS?wp5nqImd@ct~&$M%HG~HfMM=Ng`WZFZPu^B2dGUa!z6n)l?*2n
zpSkc!ANvK2s}Fy(YuYMS|Ax=11DN?W#o=jYnP`K5nNPGsZc!-IXNxk?mL@*7l%YN<
zwwFgARXK#o=sVg4!>v_pFONQ|atM>rceD%s;?^p$#7C87nN0dDrBFeC`fT?5mH4RF
U^aIJw?yEmyiI1&q(#O{48$%_;djJ3c

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/unrotated.png b/autotests/read/heif/unrotated.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/unrotated_left-to-right.heif b/autotests/read/heif/unrotated_left-to-right.heif
new file mode 100644
index 0000000000000000000000000000000000000000..b936974d5ca9495ebc40abb514e1ce3ca603ba61
GIT binary patch
literal 4868
zcmeHJ+e*Vg5S`jS#1|=|=%d;nQ2YTw{g9Z84s_ckM$kva5Aoytk9wvTnul?SWm{X=
zNtU_p%*ojVLPV!!{pKB)R|FC5I4xm*yP{4d204Gqht<p^@|@KRd!a9QIL^emyP*y)
zNT)Z`M2F%Im`BnU39Mr{#opX|8D%Wyf#=$ZF)hj2S045~`)mx|N7=3HtsWn)p^o_3
z7tkV?SZ7#$&#%)~-6Toi@3Z4d_MEVHDYOXi_1-_ap8%G)Jgw=A)O)gSA)08n3I@S-
z!%@K?81c-R*A6T4vwSTB@gv`8J6VoatsTLmVmE^AxRENONx;;$;jtgBiPo;%Og7@N
zdHzR!nxj?QMjkw?VrT|~PqZ60N2|8IJ$P2d&<qBjxI)8-$0jZE6Zx?ju(R#opI?3t
b?e>4pZX2HV53m`2BA)gP*p>0TR^#UfV64UD

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/unrotated_left-to-right.png b/autotests/read/heif/unrotated_left-to-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/unrotated_top-to-bottom.heif b/autotests/read/heif/unrotated_top-to-bottom.heif
new file mode 100644
index 0000000000000000000000000000000000000000..d01ce97f5d894d9f6f0f0077acaa92c21c4508a1
GIT binary patch
literal 4868
zcmeHK+e*Vg5S`jS#1|=|=%be(Q2YTw{g9Z84s_ckM$kva5Aoytk9sz1OCYn02?-I|
zX|^+SW_RY~q=lA<j`Q+WE6y(oX1wA!NBE_(GBz0O^f6r&HYC!Vl$&_t&v>y)Omcfo
z6TD!Pne{~bCOv0fnzkrl9U{qgezNCf!Y16)Tq+Y(TT<4AMtsLQS;5b-?Z%uf9`3K;
z4){rD@Ww8%PO#>hU#eEqD2kBpvf_&O5o;9#Fb00JxA*A>h(#)maW8A}T90HR8GvJ1
z;Nw?5=re>q_Pc7|{r%fkyFIVr__XD3_Xj?H-GV+rAHM?rYW?#g#{T2IS49qWu=k1n
zhV{{6>_6UnRpd|yd!OiUIO1rLSl}bdvIYOLK6P%*czX+j2F<xHq&1CBKge9uo4AV)
leUf;|{{}(QYt6YX#MMS51F#z(*OcGmfsbFSpwIu%=NtCc#p3_~

literal 0
HcmV?d00001

diff --git a/autotests/read/heif/unrotated_top-to-bottom.png b/autotests/read/heif/unrotated_top-to-bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..be62095b39e3883a93ff369e4e41e716a63a1c5e
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!2~34Z_DupQhA;(jv*Dd-cFC@I-tPQJp19_
z_Zudsy-!N~%q~+`c|}Pv*J-M9<K@|!7uG)eDLR|cNkGc=<(G~xn=Z-U-8I*#DEywx
zk^ss2L&3(fx93|p`yMal7t>X4&yZ|U2-&R@og-F%x^9c1n?$Pu%fhJ@3=dyQ-8r4|
RQ5<M9gQu&X%Q~loCIAz1KL`K-

literal 0
HcmV?d00001

diff --git a/src/imageformats/heif.cpp b/src/imageformats/heif.cpp
index 41e7559..191fa95 100644
--- a/src/imageformats/heif.cpp
+++ b/src/imageformats/heif.cpp
@@ -608,22 +608,67 @@ bool HEIFHandler::read_orientation_helper(void *heif_handle, const void *heif_ct
 
     if (rotation_ccw == -1 && mirror == heif_transform_mirror_direction::heif_transform_mirror_direction_invalid) {
         m_orientation = 0;
-    } else if (rotation_ccw == 0 && mirror == heif_transform_mirror_direction::heif_transform_mirror_direction_invalid) {
-        m_orientation = 1;
-    } else if (rotation_ccw <= 0 && mirror == heif_transform_mirror_direction::heif_transform_mirror_direction_horizontal) {
-        m_orientation = 2;
-    } else if (rotation_ccw == 180 && mirror == heif_transform_mirror_direction::heif_transform_mirror_direction_invalid) {
-        m_orientation = 3;
-    } else if (rotation_ccw <= 0 && mirror == heif_transform_mirror_direction::heif_transform_mirror_direction_vertical) {
-        m_orientation = 4;
-    } else if (rotation_ccw == 270 && mirror == heif_transform_mirror_direction::heif_transform_mirror_direction_horizontal) {
-        m_orientation = 5;
-    } else if (rotation_ccw == 270 && mirror == heif_transform_mirror_direction::heif_transform_mirror_direction_invalid) {
-        m_orientation = 6;
-    } else if (rotation_ccw == 270 && mirror == heif_transform_mirror_direction::heif_transform_mirror_direction_vertical) {
-        m_orientation = 7;
-    } else if (rotation_ccw == 90 && mirror == heif_transform_mirror_direction::heif_transform_mirror_direction_invalid) {
-        m_orientation = 8;
+        return true;
+    }
+
+    // The rotation is applied first, then the mirroring (the order required by MIAF)
+    switch (rotation_ccw) {
+    case -1:
+    case 0:
+        switch (mirror) {
+        case heif_transform_mirror_direction::heif_transform_mirror_direction_horizontal:
+            m_orientation = 2;
+            break;
+        case heif_transform_mirror_direction::heif_transform_mirror_direction_vertical:
+            m_orientation = 4;
+            break;
+        default:
+            m_orientation = 1;
+            break;
+        }
+        break;
+    case 90:
+        switch (mirror) {
+        case heif_transform_mirror_direction::heif_transform_mirror_direction_horizontal:
+            m_orientation = 7;
+            break;
+        case heif_transform_mirror_direction::heif_transform_mirror_direction_vertical:
+            m_orientation = 5;
+            break;
+        default:
+            m_orientation = 8;
+            break;
+        }
+        break;
+    case 180:
+        switch (mirror) {
+        case heif_transform_mirror_direction::heif_transform_mirror_direction_horizontal:
+            m_orientation = 4;
+            break;
+        case heif_transform_mirror_direction::heif_transform_mirror_direction_vertical:
+            m_orientation = 2;
+            break;
+        default:
+            m_orientation = 3;
+            break;
+        }
+        break;
+    case 270:
+        switch (mirror) {
+        case heif_transform_mirror_direction::heif_transform_mirror_direction_horizontal:
+            m_orientation = 5;
+            break;
+        case heif_transform_mirror_direction::heif_transform_mirror_direction_vertical:
+            m_orientation = 7;
+            break;
+        default:
+            m_orientation = 6;
+            break;
+        }
+        break;
+    default:
+        // let libheif apply the transformations
+        return false;
     }
 
     return true;