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

Merge pull request #538 from notmasteryet/inlineimg

Browse Source 
Better 'EI' matching (ref #536)
This commit is contained in:
Andreas Gal 2011-10-01 17:23:52 -07:00
commit 297ad94c84
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pdf.js
View File

@ -2863,14 +2863,37 @@ var Parser = (function parserParser() {
// parse image stream // parse image stream
var startPos = stream.pos; var startPos = stream.pos;
var c1 = stream.getChar(); // searching for the /\sEI\s/
var c2 = stream.getChar(); var state = 0, ch;
while (!(c1 == 'E' && c2 == 'I') && c2 != null) { while (state != 4 && (ch = stream.getByte()) != null) {
c1 = c2; switch (ch) {
c2 = stream.getChar(); case 0x20:
case 0x0D:
case 0x0A:
state = state === 3 ? 4 : 1;
break;
case 0x45:
state = state === 1 ? 2 : 0;
break;
case 0x49:
state = state === 2 ? 3 : 0;
break;
default:
state = 0;
break;
}
} }
var length = (stream.pos - 2) - startPos; // TODO improve the small images performance to remove the limit
var inlineImgLimit = 500;
if (++this.inlineImg >= inlineImgLimit) {
if (this.inlineImg === inlineImgLimit)
warn('Too many inline images');
this.shift();
return null;
}
var length = (stream.pos - 4) - startPos;
var imageStream = stream.makeSubStream(startPos, length, dict); var imageStream = stream.makeSubStream(startPos, length, dict);
if (cipherTransform) if (cipherTransform)
imageStream = cipherTransform.createStream(imageStream); imageStream = cipherTransform.createStream(imageStream);
@ -4415,7 +4438,7 @@ var PartialEvaluator = (function partialEvaluator() {
fnArray.push(fn); fnArray.push(fn);
argsArray.push(args); argsArray.push(args);
args = []; args = [];
} else { } else if (obj != null) {
assertWellFormed(args.length <= 33, 'Too many arguments'); assertWellFormed(args.length <= 33, 'Too many arguments');
args.push(obj); args.push(obj);
} }