Ensure autoOrient removes metadata after shrink-on-load #4431

lovell · lovell · commit 628454559e07 · 2025-07-19T14:00:42.000+01:00
diff --git a/docs/src/content/docs/changelog/v0.34.4.md b/docs/src/content/docs/changelog/v0.34.4.md
@@ -0,0 +1,7 @@
+---
+title: v0.34.4 - TBD
+slug: changelog/v0.34.4
+---
+
+* Ensure `autoOrient` removes existing metadata after shrink-on-load.
+  [#4431](https://github.com/lovell/sharp/issues/4431)
diff --git a/src/pipeline.cc b/src/pipeline.cc
@@ -98,7 +98,6 @@ class PipelineWorker : public Napi::AsyncWorker {
       if (baton->input->autoOrient) {
         // Rotate and flip image according to Exif orientation
         std::tie(autoRotation, autoFlip, autoFlop) = CalculateExifRotationAndFlip(sharp::ExifOrientation(image));
-        image = sharp::RemoveExifOrientation(image);
       }
 
       rotation = CalculateAngleRotation(baton->angle);
@@ -294,6 +293,9 @@ class PipelineWorker : public Napi::AsyncWorker {
           throw vips::VError("Input SVG image exceeds 32767x32767 pixel limit");
         }
       }
+      if (baton->input->autoOrient) {
+        image = sharp::RemoveExifOrientation(image);
+      }
 
       // Any pre-shrinking may already have been done
       inputWidth = image.width();
diff --git a/test/unit/raw.js b/test/unit/raw.js
@@ -322,8 +322,6 @@ describe('Raw pixel data', function () {
       .gif({ keepDuplicateFrames: true })
       .toBuffer();
 
-    console.log(await sharp(gif).metadata());
-
     const { width, height, pages, delay } = await sharp(gif).metadata();
     assert.strictEqual(width, 1);
     assert.strictEqual(height, 1);
diff --git a/test/unit/rotate.js b/test/unit/rotate.js
@@ -635,6 +635,19 @@ describe('Rotation', function () {
     assert.strictEqual(height, 6);
   });
 
+  it('Shrink-on-load with autoOrient', async () => {
+    const data = await sharp(fixtures.inputJpgWithLandscapeExif6)
+      .resize(8)
+      .autoOrient()
+      .avif({ effort: 0 })
+      .toBuffer();
+
+    const { width, height, orientation } = await sharp(data).metadata();
+    assert.strictEqual(width, 8);
+    assert.strictEqual(height, 6);
+    assert.strictEqual(orientation, undefined);
+  });
+
   it('Invalid autoOrient throws', () =>
     assert.throws(
       () => sharp({ autoOrient: 'fail' }),

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ class PipelineWorker : public Napi::AsyncWorker {`
`98`	`98`	`if (baton->input->autoOrient) {`
`99`	`99`	`// Rotate and flip image according to Exif orientation`
`100`	`100`	`std::tie(autoRotation, autoFlip, autoFlop) = CalculateExifRotationAndFlip(sharp::ExifOrientation(image));`
`101`		`- image = sharp::RemoveExifOrientation(image);`
`102`	`101`	`}`
`103`	`102`
`104`	`103`	`rotation = CalculateAngleRotation(baton->angle);`
`@@ -294,6 +293,9 @@ class PipelineWorker : public Napi::AsyncWorker {`
`294`	`293`	`throw vips::VError("Input SVG image exceeds 32767x32767 pixel limit");`
`295`	`294`	`}`
`296`	`295`	`}`
	`296`	`+ if (baton->input->autoOrient) {`
	`297`	`+ image = sharp::RemoveExifOrientation(image);`
	`298`	`+ }`
`297`	`299`
`298`	`300`	`// Any pre-shrinking may already have been done`
`299`	`301`	`inputWidth = image.width();`