Merge pull request #20063 from calixteman/issue20062

calixteman · web-flow · commit 481b74a1c25d · 2025-07-08T22:10:52.000+02:00
Fix the default appearance of a Polygon annotation when a fill color is provided
diff --git a/src/core/annotation.js b/src/core/annotation.js
@@ -4337,6 +4337,24 @@ class PolylineAnnotation extends MarkupAnnotation {
       const strokeColor = this.color ? getPdfColorArray(this.color) : [0, 0, 0];
       const strokeAlpha = dict.get("CA");
 
+      let fillColor = getRgbColor(dict.getArray("IC"), null);
+      if (fillColor) {
+        fillColor = getPdfColorArray(fillColor);
+      }
+
+      let operator;
+      if (fillColor) {
+        if (this.color) {
+          operator = fillColor.every((c, i) => c === strokeColor[i])
+            ? "f"
+            : "B";
+        } else {
+          operator = "f";
+        }
+      } else {
+        operator = "S";
+      }
+
       const borderWidth = this.borderStyle.width || 1,
         borderAdjust = 2 * borderWidth;
 
@@ -4361,13 +4379,15 @@ class PolylineAnnotation extends MarkupAnnotation {
         extra: `${borderWidth} w`,
         strokeColor,
         strokeAlpha,
+        fillColor,
+        fillAlpha: fillColor ? strokeAlpha : null,
         pointsCallback: (buffer, points) => {
           for (let i = 0, ii = vertices.length; i < ii; i += 2) {
             buffer.push(
               `${vertices[i]} ${vertices[i + 1]} ${i === 0 ? "m" : "l"}`
             );
           }
-          buffer.push("S");
+          buffer.push(operator);
           return [points[0], points[7], points[2], points[3]];
         },
       });
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -731,3 +731,4 @@
 !bug1885505.pdf
 !bug1974436.pdf
 !firefox_logo.pdf
+!issue20062.pdf
diff --git a/test/pdfs/issue20062.pdf b/test/pdfs/issue20062.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -12164,5 +12164,12 @@
     "rounds": 1,
     "type": "eq",
     "annotations": true
+  },
+  {
+    "id": "issue20062",
+    "file": "pdfs/issue20062.pdf",
+    "md5": "9fa985242476c642464d94893528e40f",
+    "rounds": 1,
+    "type": "eq"
   }
 ]

Original file line number	Diff line number	Diff line change
`@@ -12164,5 +12164,12 @@`
`12164`	`12164`	`"rounds": 1,`
`12165`	`12165`	`"type": "eq",`
`12166`	`12166`	`"annotations": true`
	`12167`	`+ },`
	`12168`	`+ {`
	`12169`	`+ "id": "issue20062",`
	`12170`	`+ "file": "pdfs/issue20062.pdf",`
	`12171`	`+ "md5": "9fa985242476c642464d94893528e40f",`
	`12172`	`+ "rounds": 1,`
	`12173`	`+ "type": "eq"`
`12167`	`12174`	`}`
`12168`	`12175`	`]`