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

Don't check gen number for free entry; don't index objects twice

Browse Source
This commit is contained in:
Yury Delendik 2012-04-23 22:14:58 -05:00
parent a25c4f1226
commit fcabd176a0
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/obj.js
View File

@ -364,9 +364,8 @@ var XRef = (function XRefClosure() {
} }
} }
// Sanity check: as per spec, first object must have these properties // Sanity check: as per spec, first object must be free
if (this.entries[0] && if (this.entries[0] && !this.entries[0].free)
!(this.entries[0].gen === 65535 && this.entries[0].free))
error('Invalid XRef table: unexpected first object'); error('Invalid XRef table: unexpected first object');
// Sanity check // Sanity check
@ -525,7 +524,7 @@ var XRef = (function XRefClosure() {
} }
// reading XRef streams // reading XRef streams
for (var i = 0, ii = xrefStms.length; i < ii; ++i) { for (var i = 0, ii = xrefStms.length; i < ii; ++i) {
this.readXRef(xrefStms[i]); this.readXRef(xrefStms[i], true);
} }
// finding main trailer // finding main trailer
var dict; var dict;
@ -548,7 +547,7 @@ var XRef = (function XRefClosure() {
// nothing helps // nothing helps
error('Invalid PDF structure'); error('Invalid PDF structure');
}, },
readXRef: function XRef_readXRef(startXRef) { readXRef: function XRef_readXRef(startXRef, recoveryMode) {
var stream = this.stream; var stream = this.stream;
stream.pos = startXRef; stream.pos = startXRef;
@ -581,16 +580,18 @@ var XRef = (function XRefClosure() {
error('Invalid XRef stream'); error('Invalid XRef stream');
} }
dict = this.readXRefStream(obj); dict = this.readXRefStream(obj);
if (!dict)
error('Failed to read XRef stream');
} }
// Recursively get previous dictionary, if any // Recursively get previous dictionary, if any
obj = dict.get('Prev'); obj = dict.get('Prev');
if (isInt(obj)) if (isInt(obj))
this.readXRef(obj); this.readXRef(obj, recoveryMode);
else if (isRef(obj)) { else if (isRef(obj)) {
// The spec says Prev must not be a reference, i.e. "/Prev NNN" // The spec says Prev must not be a reference, i.e. "/Prev NNN"
// This is a fallback for non-compliant PDFs, i.e. "/Prev NNN 0 R" // This is a fallback for non-compliant PDFs, i.e. "/Prev NNN 0 R"
this.readXRef(obj.num); this.readXRef(obj.num, recoveryMode);
} }
return dict; return dict;
@ -598,6 +599,9 @@ var XRef = (function XRefClosure() {
log('(while reading XRef): ' + e); log('(while reading XRef): ' + e);
} }
if (recoveryMode)
return;
warn('Indexing all PDF objects'); warn('Indexing all PDF objects');
return this.indexObjects(); return this.indexObjects();
}, },

1
test/pdfs/issue1586.pdf.link Normal file
View File

@ -0,0 +1 @@
http://cdn.flamehaus.com/Valve_Handbook_LowRes.pdf

7
test/test_manifest.json
View File

@ -363,6 +363,13 @@
"link": true, "link": true,
"type": "eq" "type": "eq"
}, },
{ "id": "issue1586",
"file": "pdfs/issue1586.pdf",
"md5": "80d396cb306014b24ca82ceb68958fb5",
"rounds": 1,
"link": true,
"type": "load"
},
{ "id": "aboutstacks", { "id": "aboutstacks",
"file": "pdfs/aboutstacks.pdf", "file": "pdfs/aboutstacks.pdf",
"md5": "6e7c8416a293ba2d83bc8dd20c6ccf51", "md5": "6e7c8416a293ba2d83bc8dd20c6ccf51",