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

Merge pull request #6194 from Rob--W/recover-mode-start-offset

Browse Source 
Subtract start offset for xrefs in recovery mode
This commit is contained in:
Tim van der Meij 2015-07-11 17:22:08 +02:00
commit 7d4303b7c4
4 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/obj.js
View File

@ -1081,7 +1081,7 @@ var XRef = (function XRefClosure() {
} else if ((m = /^(\d+)\s+(\d+)\s+obj\b/.exec(token))) { } else if ((m = /^(\d+)\s+(\d+)\s+obj\b/.exec(token))) {
if (typeof this.entries[m[1]] === 'undefined') { if (typeof this.entries[m[1]] === 'undefined') {
this.entries[m[1]] = { this.entries[m[1]] = {
offset: position, offset: position - stream.start,
gen: m[2] | 0, gen: m[2] | 0,
uncompressed: true uncompressed: true
}; };
@ -1094,8 +1094,8 @@ var XRef = (function XRefClosure() {
var xrefTagOffset = skipUntil(content, 0, xrefBytes); var xrefTagOffset = skipUntil(content, 0, xrefBytes);
if (xrefTagOffset < contentLength && if (xrefTagOffset < contentLength &&
content[xrefTagOffset + 5] < 64) { content[xrefTagOffset + 5] < 64) {
xrefStms.push(position); xrefStms.push(position - stream.start);
this.xrefstms[position] = 1; // don't read it recursively this.xrefstms[position - stream.start] = 1; // Avoid recursion
} }
position += contentLength; position += contentLength;

1
test/pdfs/.gitignore vendored
View File

@ -145,3 +145,4 @@
!issue6010_2.pdf !issue6010_2.pdf
!issue6068.pdf !issue6068.pdf
!issue6081.pdf !issue6081.pdf
!issue6069.pdf

28
test/pdfs/issue6069.pdf Normal file
View File

@ -0,0 +1,28 @@
Some junk before the header
%PDF-1.1
1 0 obj
<</Type/Catalog/Pages 2 0 R>>
endobj
2 0 obj
<</Type/Pages/Count 1/Kids[3 0 R]/MediaBox [0 0 400 50]>>
endobj
3 0 obj
<</Type/Page/Parent 2 0 R/Resources<</Font<</F1<</Type/Font/Subtype/Type1/BaseFont/Arial>>>>>>/Contents 4 0 R>>
endobj
4 0 obj
<</Length 43>>
stream
BT/F1 14 Tf 20 20 Td(Missing value for startxref and junk before magic header) Tj ET
endstream
endobj
xref
0 5
0000000000 65535 f
0000000008 00000 n
0000000054 00000 n
0000000128 00000 n
0000000254 00000 n
trailer
<</Root 1 0 R/Size 5>>
startxref

6
test/test_manifest.json
View File

@ -2278,5 +2278,11 @@
"md5": "51a724136c0c10008bd061a78ea4b8fc", "md5": "51a724136c0c10008bd061a78ea4b8fc",
"rounds": 1, "rounds": 1,
"type": "load" "type": "load"
},
{ "id": "issue6069",
"file": "pdfs/issue6069.pdf",
"md5": "d0ad8871f4116bca8e39513ffa8b7d8e",
"rounds": 1,
"type": "load"
} }
] ]