From d8f129851110a59916cd12352b8e6b06b37411bc Mon Sep 17 00:00:00 2001
From: Lovell Fuller <github@lovell.info>
Date: Sat, 8 Jan 2022 18:48:11 +0000
Subject: [PATCH] Ensure rotate-then-extract works with EXIF mirroring #3024

---
 docs/changelog.md                             |   3 ++
 src/pipeline.cc                               |  33 ++++++++++++------
 .../expected/rotate-mirror-extract.jpg        | Bin 0 -> 1457 bytes
 test/unit/extract.js                          |  10 ++++++
 4 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 test/fixtures/expected/rotate-mirror-extract.jpg

diff --git a/docs/changelog.md b/docs/changelog.md
index c54b2a17..d2e1d042 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -43,6 +43,9 @@ Requires libvips v8.12.1
   [#3006](https://github.com/lovell/sharp/pull/3006)
   [@christopherbradleybanks](https://github.com/christopherbradleybanks)
 
+* Ensure rotate-then-extract works with EXIF mirroring.
+  [#3024](https://github.com/lovell/sharp/issues/3024)
+
 ## v0.29 - *circle*
 
 Requires libvips v8.11.3
diff --git a/src/pipeline.cc b/src/pipeline.cc
index b88d8944..23988535 100644
--- a/src/pipeline.cc
+++ b/src/pipeline.cc
@@ -80,13 +80,11 @@ class PipelineWorker : public Napi::AsyncWorker {
 
       // Calculate angle of rotation
       VipsAngle rotation;
+      bool flip = FALSE;
+      bool flop = FALSE;
       if (baton->useExifOrientation) {
         // Rotate and flip image according to Exif orientation
-        bool flip;
-        bool flop;
         std::tie(rotation, flip, flop) = CalculateExifRotationAndFlip(sharp::ExifOrientation(image));
-        baton->flip = baton->flip || flip;
-        baton->flop = baton->flop || flop;
       } else {
         rotation = CalculateAngleRotation(baton->angle);
       }
@@ -95,6 +93,14 @@ class PipelineWorker : public Napi::AsyncWorker {
       if (baton->rotateBeforePreExtract) {
         if (rotation != VIPS_ANGLE_D0) {
           image = image.rot(rotation);
+          if (flip) {
+            image = image.flip(VIPS_DIRECTION_VERTICAL);
+            flip = FALSE;
+          }
+          if (flop) {
+            image = image.flip(VIPS_DIRECTION_HORIZONTAL);
+            flop = FALSE;
+          }
           image = sharp::RemoveExifOrientation(image);
         }
         if (baton->rotationAngle != 0.0) {
@@ -384,20 +390,27 @@ class PipelineWorker : public Napi::AsyncWorker {
       }
 
       // Rotate post-extract 90-angle
-      if (!baton->rotateBeforePreExtract &&  rotation != VIPS_ANGLE_D0) {
-          image = image.rot(rotation);
-          image = sharp::RemoveExifOrientation(image);
+      if (!baton->rotateBeforePreExtract && rotation != VIPS_ANGLE_D0) {
+        image = image.rot(rotation);
+        if (flip) {
+          image = image.flip(VIPS_DIRECTION_VERTICAL);
+          flip = FALSE;
+        }
+        if (flop) {
+          image = image.flip(VIPS_DIRECTION_HORIZONTAL);
+          flop = FALSE;
+        }
+        image = sharp::RemoveExifOrientation(image);
       }
 
-
       // Flip (mirror about Y axis)
-      if (baton->flip) {
+      if (baton->flip || flip) {
         image = image.flip(VIPS_DIRECTION_VERTICAL);
         image = sharp::RemoveExifOrientation(image);
       }
 
       // Flop (mirror about X axis)
-      if (baton->flop) {
+      if (baton->flop || flop) {
         image = image.flip(VIPS_DIRECTION_HORIZONTAL);
         image = sharp::RemoveExifOrientation(image);
       }
diff --git a/test/fixtures/expected/rotate-mirror-extract.jpg b/test/fixtures/expected/rotate-mirror-extract.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..46d5a93b65106352fbc2e83599a9a742fb6930a1
GIT binary patch
literal 1457
zcmb7+do<Gv0LOoOGa6&&v6-=9bEiBLagz6|uyj45B5odyJZE(aohFK6v6UWP6_WS+
zape?Q=*XDY$~&Q}JmPebU3Jgt|NH&(`~7@B;t{b3um<2z7#s$L!(ng)0xp4+MIt37
zkr<SWw5%dVNl6id#j2=ks;S^ecr2DkBa*bVsXA0;HC;Vjik>EgO8FrHArJ_p1X3P}
zl&7d*RVe>E;&uQn0Z;&Q2uK3}qd^cfNZbM7000aDfk42oz~BHB0g(Xjj{33y2nvFL
zp)e>2_7ebsAy707fXm6NV>I*+Bi#KXGbI!Z46!7ufTaB0iwfwc@0Se#ATSUZ3cz<a
zGWw?u@}KGl@&iVzL*?{g@`o`R?*2*QF+du!+oB<8;1IBuc4u69mP|#lnT`<?YXygD
zW(#dsD%!b&dy6a`kLk?wLO1{XbW2AJFvgqo<;;`0^%Ey<6>O%LkTFH0mJ<mTMKeCN
z?L}h1C4MC|(mom;x^DDh9k&#VbZo(ryU^5Cw_<-sWYAH9?dcIW*L)&4VyLz&D|zS-
zQeRihH~x$;HWb)!eIDT>OfRjzvj1=Vc!Hr!gcV<Y@*nFc-_!(S^<=)gWtCISTAqY<
z+suo=jWz><y<}Drrz7y8v@tJ`${q9TcYgD9^U||>&4n9+GCQuf=4U;DApwr`9uwhW
z!%s$6D&4)UlCoYlUdU+RGpVpnvd&-a&npGDX{pLK<oe?4MDwdSr!1L^ifi!Bu(ua0
zLSowBOJ4TT49z+@o6+B5S?W`BoSEyO?Byc-k(IBQ2pdgC#k)4iK7U+pm=U43PSa44
z_dz+2>th+>dLHvJixt07^+cNqnUbdWsCS3D2yLa6x+R=ExbB^o&zxN>f4|cl9~R*J
zT7BOOewA_}SdKRkW~9U4*a|Z=l{6gp-p8ZAsrFza{p9D%JFVZTac{o7IYUeA@WhU_
zwl@}D&b_25T(~dstPI`Cau_l7nj?J;G*}EgP<@PA)svF{VQNeam<_Da*q0xW>P1P%
zn|!H0*9bOt=f%K+!n0(rGc9EYaBB(la~lKaF3qyHEw0t(Ubm*r3OR<H@5K*uIOu^H
zF+hyq32JAh8d%=t%XMGUj-E@d88Hq@=oLJvtm-{AYI91O#L3HD`obL9@>B&y=+@o)
z#>#1*suB&^m|rdKYdWYk$Ru^d97xR8eRafyPu6a%83{(=F1*TaD41%1!}li0LowDX
zQ9P7OU{1YY>vVBp<?3)=DG{JKzPr))GX2WSfP$&G4(7IXe|}>FcX}Qb-Z}~ECUA4z
zEJBQ^TEQXA;l&Jtw2#vr%*mZDM#gl$i3#n*<ioRx8DG@Gcg6};xvmR+6p=>G!Av}>
zR4@|OWLC<39pu@tEQ*#&zhD+gf80c{!qe}wWSSq7F_9R+OYybm$uZT`_p~J!E$85H
zzZNx%^h`~|9ul#!Cus8Oqnix&MPi(S-_8X*z1p5L9Hr3XfG5vKy0B0LonzF3-w$2;
z{s41laKQkx1-9Z$!UYacVcd4uC+dyNlpCrG=llElCc?B68F(k#+g%N-`IZxxP-iu;
ziGlHKN*t6R^sDpK>qfM&$qZ_MIS)<T{|L;M4Iy%J>w@ntzlrVd>vjLI%7lvnlai9M
z3PlIv-n7&jN#kCPE_aW675;^HTJJk78BG^GF$>>xlET_Ir!0-H8yiXHs9h=F6BJB+
zpE)&|N#h;QTEI@YMB2U$jzSDnTW+im+bw6zRqgR=q;UZY`$1FPL5i1@+m6j>O-V_G
zZW-Y&dnKoPNZ=dwblXwnR(X(#{j93v3p1OH49}+eJ3}hBDMK7pQ3@kr(UI<vr_f0y
VqQ-J^LIiU$83<FlU3!mr^j{05U@HIs

literal 0
HcmV?d00001

diff --git a/test/unit/extract.js b/test/unit/extract.js
index 442638dc..4120cb27 100644
--- a/test/unit/extract.js
+++ b/test/unit/extract.js
@@ -168,6 +168,16 @@ describe('Partial image extraction', function () {
       });
   });
 
+  it('Rotate with EXIF mirroring then extract', function (done) {
+    sharp(fixtures.inputJpgWithLandscapeExif7)
+      .rotate()
+      .extract({ left: 0, top: 208, width: 60, height: 40 })
+      .toBuffer(function (err, data) {
+        if (err) throw err;
+        fixtures.assertSimilar(fixtures.expected('rotate-mirror-extract.jpg'), data, done);
+      });
+  });
+
   describe('Invalid parameters', function () {
     describe('using the legacy extract(top,left,width,height) syntax', function () {
       it('String top', function () {