Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7387 from Snuffleupagus/issue-5808

Browse Source 
Attempt to ignore multiple identical Tf (setFont) commands in `PartialEvaluator_getTextContent` (issue 5808)
This commit is contained in:
Yury Delendik 2016-08-30 15:21:41 -05:00 committed by GitHub
commit ffa99397ad
4 changed files with 169 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/evaluator.js
View File

@ -1422,9 +1422,17 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
switch (fn | 0) {
case OPS.setFont:
// Optimization to ignore multiple identical Tf commands.
var fontNameArg = args[0].name, fontSizeArg = args[1];
if (textState.font && fontNameArg === textState.fontName &&
fontSizeArg === textState.fontSize) {
break;
}
flushTextContentItem();
textState.fontSize = args[1];
next(handleSetFont(args[0].name, null));
textState.fontName = fontNameArg;
textState.fontSize = fontSizeArg;
next(handleSetFont(fontNameArg, null));
return;
case OPS.setTextRise:
flushTextContentItem();
@ -1641,6 +1649,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
}
var gStateFont = gState.get('Font');
if (gStateFont) {
textState.fontName = null;
textState.fontSize = gStateFont[1];
next(handleSetFont(null, gStateFont[0]));
return;
@ -2560,6 +2569,7 @@ var StateManager = (function StateManagerClosure() {
var TextState = (function TextStateClosure() {
function TextState() {
this.ctm = new Float32Array(IDENTITY_MATRIX);
this.fontName = null;
this.fontSize = 0;
this.font = null;
this.fontMatrix = FONT_IDENTITY_MATRIX;

1
test/pdfs/.gitignore vendored
View File

@ -18,6 +18,7 @@
!issue5946.pdf
!issue5972.pdf
!issue5874.pdf
!issue5808.pdf
!issue6204.pdf
!issue6782.pdf
!issue6961.pdf

149
test/pdfs/issue5808.pdf Normal file
View File

@ -0,0 +1,149 @@
%PDF-1.7
%âãÏÓ
1 0 obj
<<
/Pages 2 0 R
/Type /Catalog
>>
endobj
2 0 obj
<<
/Kids [3 0 R]
/Count 1
/Type /Pages
>>
endobj
3 0 obj
<<
/Parent 2 0 R
/MediaBox [0 0 300 50]
/Resources
<<
/Font
<<
/F1 4 0 R
>>
>>
/Contents 5 0 R
/Type /Page
>>
endobj
4 0 obj
<<
/BaseFont /Times-Roman
/Subtype /Type1
/Encoding /WinAnsiEncoding
/Type /Font
>>
endobj
5 0 obj
<<
/Length 729
>>
stream
BT
10 20 TD
/F1 14 Tf
(I) Tj
/F1 14 Tf
(s) Tj
/F1 14 Tf
(s) Tj
/F1 14 Tf
(u) Tj
/F1 14 Tf
(e) Tj
/F1 14 Tf
( ) Tj
/F1 14 Tf
(5) Tj
/F1 14 Tf
(8) Tj
/F1 14 Tf
(0) Tj
/F1 14 Tf
(8) Tj
/F1 14 Tf
( ) Tj
/F1 14 Tf
(-) Tj
/F1 14 Tf
( ) Tj
/F1 14 Tf
(A) Tj
/F1 14 Tf
( ) Tj
/F1 14 Tf
(T) Tj
/F1 14 Tf
(f) Tj
/F1 14 Tf
( ) Tj
/F1 14 Tf
(c) Tj
/F1 14 Tf
(m) Tj
/F1 14 Tf
(d) Tj
/F1 14 Tf
( ) Tj
/F1 14 Tf
(b) Tj
/F1 14 Tf
(e) Tj
/F1 14 Tf
(f) Tj
/F1 14 Tf
(o) Tj
/F1 14 Tf
(r) Tj
/F1 14 Tf
(e) Tj
/F1 14 Tf
( ) Tj
/F1 14 Tf
(e) Tj
/F1 14 Tf
(v) Tj
/F1 14 Tf
(e) Tj
/F1 14 Tf
(r) Tj
/F1 14 Tf
(y) Tj
/F1 14 Tf
( ) Tj
/F1 14 Tf
(T) Tj
/F1 14 Tf
(j) Tj
/F1 14 Tf
( ) Tj
/F1 14 Tf
(c) Tj
/F1 14 Tf
(m) Tj
/F1 14 Tf
(d) Tj
/F1 14 Tf
(.) Tj
ET
endstream
endobj xref
0 6
0000000000 65535 f
0000000015 00000 n
0000000066 00000 n
0000000125 00000 n
0000000254 00000 n
0000000355 00000 n
trailer
<<
/Root 1 0 R
/Size 6
>>
startxref
1137
%%EOF

7
test/test_manifest.json
View File

@ -1168,6 +1168,13 @@
"type": "eq",
"about": "Please note that this file currently renders incorrectly."
},
{ "id": "issue5808-text",
"file": "pdfs/issue5808.pdf",
"md5": "e0584dd540d7859d6c191aa53379692e",
"rounds": 1,
"link": false,
"type": "text"
},
{ "id": "issue6962",
"file": "pdfs/issue6962.pdf",
"md5": "d40e871ecca68baf93114bd28c782148",