Prevent double unpremultiply with some composite blends

lovell · Mar 4, 2022 · 23033e2 · 23033e2
1 parent dd3b782
commit 23033e2
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 2 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -4,6 +4,11 @@
 
 Requires libvips v8.12.2
 
+### v0.30.3 - TBD
+
+* Prevent double unpremultiply with some composite blend modes (regression in 0.30.2).
+  [#3118](https://github.com/lovell/sharp/issues/3118)
+
 ### v0.30.2 - 2nd March 2022
 
 * Improve performance and accuracy when compositing multiple images.

diff --git a/src/pipeline.cc b/src/pipeline.cc
@@ -354,7 +354,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       }
 
       bool const shouldPremultiplyAlpha = sharp::HasAlpha(image) &&
-        (shouldResize || shouldBlur || shouldConv || shouldSharpen || shouldComposite);
+        (shouldResize || shouldBlur || shouldConv || shouldSharpen);
 
       // Premultiply image alpha channel before all transformations to avoid
       // dark fringing around bright pixels

diff --git a/test/fixtures/expected/composite-multiple.png b/test/fixtures/expected/composite-multiple.png
diff --git a/test/fixtures/expected/composite.blend.dest-over.png b/test/fixtures/expected/composite.blend.dest-over.png
diff --git a/test/fixtures/expected/composite.blend.over.png b/test/fixtures/expected/composite.blend.over.png
diff --git a/test/fixtures/expected/composite.blend.saturate.png b/test/fixtures/expected/composite.blend.saturate.png
diff --git a/test/fixtures/expected/composite.blend.xor.png b/test/fixtures/expected/composite.blend.xor.png
diff --git a/test/unit/extend.js b/test/unit/extend.js
@@ -158,6 +158,6 @@ describe('Extend', function () {
       })
       .raw()
       .toBuffer();
-    assert.deepStrictEqual(Array.from(data), [191, 25, 65, 204, 238, 31, 82, 204]);
+    assert.deepStrictEqual(Array.from(data), [191, 25, 66, 204, 191, 25, 66, 204]);
   });
 });