1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-20 15:18:08 +02:00

Fix several issues with radial/axial shadings and tiling patterns.

Previously, we set the base transformation and pattern matrix
directly to the main rendering ctx of the page, however doing this
caused the current transform to be lost. This would cause issues
with things like shear missing so the pattern was misaligned or when
stroke was used the scale of the line width or dash would be wrong.
Instead we should leave the current transform and use setTransfrom
on the pattern so it is applied correctly. For axial and radial shadings I had
to create a temporary canvas to draw the shading so I could in turn
use setTransform.

Fixes: #13325, #6769, #7847, #11018, #11597, #11473

The following already in the corpus are improved:
issue8078-page1
issue1877-page1
This commit is contained in:
Brendan Dahl 2021-05-10 17:43:37 -07:00
parent 3f187c2c6d
commit ac44afa70e
10 changed files with 492 additions and 50 deletions

View file

@ -42,6 +42,7 @@
!issue7406.pdf
!issue7426.pdf
!issue7439.pdf
!issue7847_radial.pdf
!issue7446.pdf
!issue7492.pdf
!issue7544.pdf
@ -101,6 +102,7 @@
!issue11242_reduced.pdf
!issue11279.pdf
!issue11362.pdf
!issue13325_reduced.pdf
!issue11578_reduced.pdf
!issue11651.pdf
!issue11878.pdf
@ -296,6 +298,7 @@
!bug1028735.pdf
!bug1046314.pdf
!bug1065245.pdf
!issue6769.pdf
!bug1151216.pdf
!bug1175962.pdf
!bug1020226.pdf
@ -365,6 +368,7 @@
!issue5481.pdf
!issue5567.pdf
!issue5701.pdf
!issue6769_no_matrix.pdf
!issue12007_reduced.pdf
!issue5896.pdf
!issue6010_1.pdf
@ -378,6 +382,7 @@
!issue13271.pdf
!issue6298.pdf
!issue6889.pdf
!issue11473.pdf
!bug1001080.pdf
!bug1671312_reduced.pdf
!bug1671312_ArialNarrow.pdf

BIN
test/pdfs/issue11473.pdf Normal file

Binary file not shown.

Binary file not shown.

114
test/pdfs/issue6769.pdf Normal file
View file

@ -0,0 +1,114 @@
%PDF-1.5
%âãÏÓ
1 0 obj
<<
/Kids [2 0 R]
/Type /Pages
/Count 1
>>
endobj
2 0 obj
<<
/Resources 3 0 R
/Type /Page
/Parent 1 0 R
/Contents 4 0 R
/MediaBox [0 0 100 100]
/Group
<<
/CS /DeviceRGB
/I true
/Type /Group
/S /Transparency
>>
>>
endobj
3 0 obj
<<
/ExtGState
<<
/a0
<<
/CA 1
/ca 1
>>
>>
/Pattern
<<
/p5 5 0 R
>>
>>
endobj
5 0 obj
<<
/PatternType 2
/Type /Pattern
/Shading
<<
/Coords [0 0 0 0 0 100]
/Extend [true true]
/Function 6 0 R
/ShadingType 3
/Domain [0 1]
/ColorSpace /DeviceRGB
>>
/Matrix [1 0 0 -1 0 10]
>>
endobj
4 0 obj
<<
/Length 77
>>
stream
q
/Pattern CS /p5 SCN /a0 gs
0.3 0 0 0.1 0 0 cm
50 w
100 100 m
300 700 l
S
Q
endstream
endobj
6 0 obj
<<
/FunctionType 2
/N 1
/C1 [0 1 0]
/C0 [0 0 1]
/Domain [0 1]
>>
endobj
7 0 obj
<<
/Type /Catalog
/Pages 1 0 R
>>
endobj
8 0 obj
<<
/Creator (cairo 1.13.1 \(http://cairographics.org\))
/Producer (cairo 1.13.1 \(http://cairographics.org\))
>>
endobj xref
0 9
0000000000 65535 f
0000000015 00000 n
0000000074 00000 n
0000000247 00000 n
0000000542 00000 n
0000000337 00000 n
0000000672 00000 n
0000000754 00000 n
0000000805 00000 n
trailer
<<
/Info 8 0 R
/Root 7 0 R
/Size 9
>>
startxref
934
%%EOF

View file

@ -0,0 +1,114 @@
%PDF-1.5
%âãÏÓ
1 0 obj
<<
/Kids [2 0 R]
/Type /Pages
/Count 1
>>
endobj
2 0 obj
<<
/Resources 3 0 R
/Type /Page
/Parent 1 0 R
/Contents 4 0 R
/MediaBox [0 0 100 100]
/Group
<<
/CS /DeviceRGB
/I true
/Type /Group
/S /Transparency
>>
>>
endobj
3 0 obj
<<
/ExtGState
<<
/a0
<<
/CA 1
/ca 1
>>
>>
/Pattern
<<
/p5 5 0 R
>>
>>
endobj
5 0 obj
<<
/PatternType 2
/Type /Pattern
/Shading
<<
/Coords [0 0 0 0 0 100]
/Extend [true true]
/Function 6 0 R
/ShadingType 3
/Domain [0 1]
/ColorSpace /DeviceRGB
>>
/Matrix [2 0 0 2 0 0]
>>
endobj
4 0 obj
<<
/Length 77
>>
stream
q
/Pattern CS /p5 SCN /a0 gs
0.3 0 0 0.1 0 0 cm
50 w
100 100 m
300 700 l
S
Q
endstream
endobj
6 0 obj
<<
/FunctionType 2
/N 1
/C1 [0 1 0]
/C0 [0 0 1]
/Domain [0 1]
>>
endobj
7 0 obj
<<
/Type /Catalog
/Pages 1 0 R
>>
endobj
8 0 obj
<<
/Creator (cairo 1.13.1 \(http://cairographics.org\))
/Producer (cairo 1.13.1 \(http://cairographics.org\))
>>
endobj xref
0 9
0000000000 65535 f
0000000015 00000 n
0000000074 00000 n
0000000247 00000 n
0000000542 00000 n
0000000337 00000 n
0000000672 00000 n
0000000754 00000 n
0000000805 00000 n
trailer
<<
/Info 8 0 R
/Root 7 0 R
/Size 9
>>
startxref
934
%%EOF

View file

@ -0,0 +1,130 @@
%PDF-1.3
%ÿÿÿÿ
6 0 obj
<<
/FunctionType 2
/Domain [0 1]
/C0 [1 1 0]
/C1 [0 0.5019607843137255 0]
/N 1
>>
endobj
7 0 obj
<<
/FunctionType 2
/Domain [0 1]
/C0 [0 0.5019607843137255 0]
/C1 [1 1 1]
/N 1
>>
endobj
8 0 obj
<<
/FunctionType 3
/Domain [0 1]
/Functions [6 0 R 7 0 R]
/Bounds [0.5]
/Encode [0 1 0 1]
>>
endobj
9 0 obj
<<
/ShadingType 3
/ColorSpace /DeviceRGB
/Coords [0.5 0.5 0 0.5 0.5 0.5]
/Function 8 0 R
/Extend [true true]
>>
endobj
10 0 obj
<<
/Type /Pattern
/PatternType 2
/Shading 9 0 R
/Matrix [440 0 0 -200 20 220]
>>
endobj
11 0 obj
<<
/Type /ExtGState
/ca 1
>>
endobj
5 0 obj
<<
/Type /Page
/Parent 1 0 R
/MediaBox [0 0 480 240]
/Contents 3 0 R
/Resources 4 0 R
>>
endobj
4 0 obj
<<
/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
/Pattern <<
/Sh1 10 0 R
>>
/ExtGState <<
/Gs1 11 0 R
>>
>>
endobj
3 0 obj
<<
/Length 66
>>
stream
1 0 0 -1 0 240 cm
20 20 440 200 re
/Pattern cs
/Sh1 scn
/Gs1 gs
f
endstream
endobj
12 0 obj
<<
/Producer (PDFKit)
/Creator (PDFKit)
/CreationDate (D:20161124005340Z)
>>
endobj
2 0 obj
<<
/Type /Catalog
/Pages 1 0 R
>>
endobj
1 0 obj
<<
/Type /Pages
/Count 1
/Kids [5 0 R]
>>
endobj
xref
0 13
0000000000 65535 f
0000001071 00000 n
0000001022 00000 n
0000000813 00000 n
0000000690 00000 n
0000000586 00000 n
0000000015 00000 n
0000000112 00000 n
0000000209 00000 n
0000000317 00000 n
0000000444 00000 n
0000000541 00000 n
0000000929 00000 n
trailer
<<
/Size 13
/Root 2 0 R
/Info 12 0 R
>>
startxref
1128
%%EOF

View file

@ -485,6 +485,12 @@
"lastPage": 2,
"type": "load"
},
{ "id": "issue7847_radial",
"file": "pdfs/issue7847_radial.pdf",
"md5": "59dc206ec5dd6e6f701943e4694e4147",
"rounds": 1,
"type": "eq"
},
{ "id": "rotation",
"file": "pdfs/rotation.pdf",
"md5": "4fb25ada00ce7528569d9791c14decf5",
@ -637,6 +643,12 @@
"rounds": 1,
"type": "eq"
},
{ "id": "issue6769_no_matrix",
"file": "pdfs/issue6769_no_matrix.pdf",
"md5": "f88806137fb4592975052ff3508d7b1e",
"rounds": 1,
"type": "eq"
},
{ "id": "unix01",
"file": "pdfs/unix01.pdf",
"md5": "2742999f0bf9b9c035dbb0736096e220",
@ -2552,6 +2564,12 @@
"rounds": 1,
"type": "eq"
},
{ "id": "issue6769",
"file": "pdfs/issue6769.pdf",
"md5": "724b94d6bd1e8010403328446d0ab061",
"rounds": 1,
"type": "eq"
},
{ "id": "issue4304",
"file": "pdfs/issue4304.pdf",
"md5": "1b1205bf0d7c1ad22a154b60da8e694d",
@ -3976,6 +3994,12 @@
"link": true,
"type": "eq"
},
{ "id": "issue11473",
"file": "pdfs/issue11473.pdf",
"md5": "c530851b0523c81784ab4ea3115a7c67",
"rounds": 1,
"type": "eq"
},
{ "id": "bug1140761",
"file": "pdfs/bug1140761.pdf",
"md5": "b74eced7634d4f248dc6265f8225d432",
@ -4392,6 +4416,12 @@
"type": "eq",
"about": "Support for CMap GBKp-EUC-H"
},
{ "id": "issue13325_reduced",
"file": "pdfs/issue13325_reduced.pdf",
"md5": "a9311230d2e3388070711be8748a1aa0",
"rounds": 1,
"type": "eq"
},
{ "id": "issue2829",
"file": "pdfs/issue2829.pdf",
"md5": "f32b28cf8792f6ccc470446bfbb38584",