From d114f71feb7051f922fe02a02b81b34aeba2a631 Mon Sep 17 00:00:00 2001
From: Calixte Denizet <calixte.denizet@gmail.com>
Date: Sat, 26 Oct 2024 14:14:44 +0200
Subject: [PATCH] Always fill the mask with the backdrop color

It fixes #18956.

In the patch #18029, for performance reasons and because I thought it was useless, I deliberately chose to not fill the mask
with the backdrop color when it's full black: it was a bad idea.
So in this patch we always add the backdrop color to the mask.
---
 src/display/canvas.js    |  15 +++++++--------
 test/pdfs/.gitignore     |   1 +
 test/pdfs/issue18956.pdf | Bin 0 -> 9204 bytes
 test/test_manifest.json  |   7 +++++++
 4 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100755 test/pdfs/issue18956.pdf

diff --git a/src/display/canvas.js b/src/display/canvas.js
index 814dc3d811f27..098741ce9d275 100644
--- a/src/display/canvas.js
+++ b/src/display/canvas.js
@@ -1498,6 +1498,7 @@ class CanvasGraphics {
     let maskY = layerOffsetY - maskOffsetY;
 
     if (backdrop) {
+      const backdropRGB = Util.makeHexColor(...backdrop);
       if (
         maskX < 0 ||
         maskY < 0 ||
@@ -1511,16 +1512,14 @@ class CanvasGraphics {
         );
         const ctx = canvas.context;
         ctx.drawImage(maskCanvas, -maskX, -maskY);
-        if (backdrop.some(c => c !== 0)) {
-          ctx.globalCompositeOperation = "destination-atop";
-          ctx.fillStyle = Util.makeHexColor(...backdrop);
-          ctx.fillRect(0, 0, width, height);
-          ctx.globalCompositeOperation = "source-over";
-        }
+        ctx.globalCompositeOperation = "destination-atop";
+        ctx.fillStyle = backdropRGB;
+        ctx.fillRect(0, 0, width, height);
+        ctx.globalCompositeOperation = "source-over";
 
         maskCanvas = canvas.canvas;
         maskX = maskY = 0;
-      } else if (backdrop.some(c => c !== 0)) {
+      } else {
         maskCtx.save();
         maskCtx.globalAlpha = 1;
         maskCtx.setTransform(1, 0, 0, 1, 0, 0);
@@ -1528,7 +1527,7 @@ class CanvasGraphics {
         clip.rect(maskX, maskY, width, height);
         maskCtx.clip(clip);
         maskCtx.globalCompositeOperation = "destination-atop";
-        maskCtx.fillStyle = Util.makeHexColor(...backdrop);
+        maskCtx.fillStyle = backdropRGB;
         maskCtx.fillRect(maskX, maskY, width, height);
         maskCtx.restore();
       }
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
index 7af1f403d887e..b10be1106d6b6 100644
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@ -679,3 +679,4 @@
 !issue18036.pdf
 !issue18894.pdf
 !bug1922766.pdf
+!issue18956.pdf
diff --git a/test/pdfs/issue18956.pdf b/test/pdfs/issue18956.pdf
new file mode 100755
index 0000000000000000000000000000000000000000..7f71918c691cdfa97fc531323773c1922bffc9b4
GIT binary patch
literal 9204
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
beGs~{1loQj{=NvXgncZ6VSs1{KNtBox<N`n

literal 0
HcmV?d00001

diff --git a/test/test_manifest.json b/test/test_manifest.json
index 38698ad8a4d03..da0e82f7f77c3 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -10734,5 +10734,12 @@
     "type": "eq",
     "link": true,
     "talos": false
+  },
+  {
+    "id": "issue18956",
+    "file": "pdfs/issue18956.pdf",
+    "md5": "73e8cd32bd063e42fcc4b270c78549b1",
+    "rounds": 1,
+    "type": "eq"
   }
 ]