Fix rendering of stencil mask painted with tiling patterns
The stencil mask is painted with two patterns:
- first: a single cell with page dimensions, only the top half
is filled black
- second: same as the first, but the second half is filled black
This combination should give us an output where both rectangles
are black. Because of this bug in pdfium, only the second is
black. This is due to the render device used to draw pattern image
being initialized with RGB color and filled white.
- the first pattern with the stencil mask, produces an output
where the first rect is black second is white
- the second pattern with the stencil mask, produces an output
where first rect is white second is black (overriding the previous
pattern output)
Bug: pdfium:1966
Change-Id: I97fa5e30640d7a0d1d7e1970c2fbe96fcb3a85c2
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/102850
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/render/cpdf_imagerenderer.cpp b/core/fpdfapi/render/cpdf_imagerenderer.cpp
index 5fffbff..aa2038a 100644
--- a/core/fpdfapi/render/cpdf_imagerenderer.cpp
+++ b/core/fpdfapi/render/cpdf_imagerenderer.cpp
@@ -309,11 +309,11 @@
CFX_Matrix new_matrix = GetDrawMatrix(rect);
CFX_DefaultRenderDevice bitmap_device1;
- if (!bitmap_device1.Create(rect.Width(), rect.Height(), FXDIB_Format::kRgb32,
+ if (!bitmap_device1.Create(rect.Width(), rect.Height(), FXDIB_Format::kArgb,
nullptr)) {
return true;
}
- bitmap_device1.GetBitmap()->Clear(0xffffff);
+ bitmap_device1.GetBitmap()->Clear(0);
CPDF_RenderStatus bitmap_render(m_pRenderStatus->GetContext(),
&bitmap_device1);
diff --git a/testing/SUPPRESSIONS b/testing/SUPPRESSIONS
index e9b32ac..c5c94b8 100644
--- a/testing/SUPPRESSIONS
+++ b/testing/SUPPRESSIONS
@@ -404,6 +404,9 @@
# TODO(pdfium:1973): Remove after associated bug is fixed
bug_1973.in * * * agg,skia
+# TODO(pdfium:1968): Remove after associated bug is fixed
+bug_1966.in * * * skia
+
# TODO(chromium:237527): Remove after associated bug is fixed
bug_237527_1.in * * * *
diff --git a/testing/resources/pixel/bug_1966.in b/testing/resources/pixel/bug_1966.in
new file mode 100644
index 0000000..b52a6cb
--- /dev/null
+++ b/testing/resources/pixel/bug_1966.in
@@ -0,0 +1,121 @@
+{{header}}
+{{object 1 0}} <<
+ /Type /Catalog
+ /Pages 2 0 R
+>>
+endobj
+{{object 2 0}} <<
+ /Type /Pages
+ /Count 1
+ /Kids [3 0 R]
+ /MediaBox [0 0 128.571 128.571]
+>>
+endobj
+{{object 3 0}} <<
+ /Type /Page
+ /Parent 2 0 R
+ /Contents 7 0 R
+ /Resources <<
+ /XObject <<
+ /Im1 4 0 R
+ >>
+ /Pattern <<
+ /P1 5 0 R
+ /P2 6 0 R
+ >>
+ >>
+>>
+endobj
+{{object 4 0}} <<
+ /Type /XObject
+ /Subtype /Image
+ /BitsPerComponent 1
+ /Filter /ASCIIHexDecode
+ /Height 40
+ /ImageMask true
+ /Width 80
+ {{streamlen}}
+>>
+stream
+FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000FFFF
+FFFF000000000000FFFFFFFF0FFFFFFFFFF0FFFFFFFF0FFFFFFFFFF0FFFF
+FFFF0FFFFFFFFFF0FFFFFFFF0FFFFFFFFFF0FFFFFFFF000000000000FFFF
+FFFF000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+FFFF000000000000FFFFFFFF000000000000FFFFFFFF0FFFFFFFFFF0FFFF
+FFFF0FFFFFFFFFF0FFFFFFFF0FFFFFFFFFF0FFFFFFFF0FFFFFFFFFF0FFFF
+FFFF000000000000FFFFFFFF000000000000FFFFFFFFFFFFFFFFFFFFFFFF
+FFFFFFFFFFFFFFFFFFFF
+endstream
+endobj
+{{object 5 0}} <<
+ /Type /Pattern
+ /PaintType 1
+ /PatternType 1
+ /TilingType 1
+ /BBox [0 0 128.571 128.571]
+ /XStep 128.571
+ /YStep 128.571
+ {{streamlen}}
+>>
+stream
+q
+0.0 0.0 0.0 rg
+0 128.571 m
+128.571 128.571 l
+128.571 64 l
+0 64 l
+f
+Q
+endstream
+endobj
+{{object 6 0}} <<
+ /Type /Pattern
+ /PaintType 1
+ /PatternType 1
+ /TilingType 1
+ /BBox [0 0 128.571 128.571]
+ /XStep 128.571
+ /YStep 128.571
+ {{streamlen}}
+>>
+stream
+% second pattern
+q
+0.0 0.0 0.0 rg
+0 64 m
+128.571 64 l
+128.571 0 l
+0 0 l
+f
+Q
+endstream
+endobj
+{{object 7 0}} <<
+ {{streamlen}}
+>>
+stream
+q
+/Pattern cs
+/P1 scn
+q
+128.571 0 0 128.571 0 0 cm
+/Im1 Do
+Q
+/P2 scn
+q
+128.571 0 0 128.571 0 0 cm
+/Im1 Do
+Q
+Q
+endstream
+endobj
+{{xref}}
+{{trailer}}
+{{startxref}}
+%%EOF
\ No newline at end of file
diff --git a/testing/resources/pixel/bug_1966_expected.pdf.0.png b/testing/resources/pixel/bug_1966_expected.pdf.0.png
new file mode 100644
index 0000000..47d12bd
--- /dev/null
+++ b/testing/resources/pixel/bug_1966_expected.pdf.0.png
Binary files differ
