Merge pull request #8808 from janpe2/issue8741

Fix color of image masks inside uncolored patterns
mozilla · Sep 12, 2017 · f2618eb · f2618eb
2 parents 2916ed0 + 8602039
commit f2618eb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/src/display/pattern_helper.js b/src/display/pattern_helper.js
@@ -360,7 +360,7 @@ var TilingPattern = (function TilingPatternClosure() {
       var graphics = canvasGraphicsFactory.createCanvasGraphics(tmpCtx);
       graphics.groupLevel = owner.groupLevel;
 
-      this.setFillAndStrokeStyleToContext(tmpCtx, paintType, color);
+      this.setFillAndStrokeStyleToContext(graphics, paintType, color);
 
       this.setScale(width, height, xstep, ystep);
       this.transformToScale(graphics);
@@ -401,17 +401,23 @@ var TilingPattern = (function TilingPatternClosure() {
     },
 
     setFillAndStrokeStyleToContext:
-      function setFillAndStrokeStyleToContext(context, paintType, color) {
+      function setFillAndStrokeStyleToContext(graphics, paintType, color) {
+        let context = graphics.ctx, current = graphics.current;
         switch (paintType) {
           case PaintType.COLORED:
             var ctx = this.ctx;
             context.fillStyle = ctx.fillStyle;
             context.strokeStyle = ctx.strokeStyle;
+            current.fillColor = ctx.fillStyle;
+            current.strokeColor = ctx.strokeStyle;
             break;
           case PaintType.UNCOLORED:
             var cssColor = Util.makeCssRgb(color[0], color[1], color[2]);
             context.fillStyle = cssColor;
             context.strokeStyle = cssColor;
+            // Set color needed by image masks (fixes issues 3226 and 8741).
+            current.fillColor = cssColor;
+            current.strokeColor = cssColor;
             break;
           default:
             throw new FormatError(`Unsupported paint type: ${paintType}`);

diff --git a/test/pdfs/pr8808.pdf.link b/test/pdfs/pr8808.pdf.link
@@ -0,0 +1 @@
+http://soap.plansystem.dk/pdfarchive/20_1057347_APPROVED_1193694109382.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -707,6 +707,14 @@
        "lastPage": 1,
        "type": "load"
     },
+    {  "id": "pr8808",
+       "file": "pdfs/pr8808.pdf",
+       "md5": "bdac6051a98fd8dcfc5344b05fed06f4",
+       "rounds": 1,
+       "link": true,
+       "lastPage": 1,
+       "type": "eq"
+    },
     {  "id": "issue5599",
        "file": "pdfs/issue5599.pdf",
        "md5": "529a4a9409ac024aeb57a047210280fe",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		http://soap.plansystem.dk/pdfarchive/20_1057347_APPROVED_1193694109382.pdf