|
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
|
|
(typeof window !== 'undefined' ? window : this).PDFJS = {};
|
|
(typeof window !== 'undefined' ? window : this).PDFJS = {};
|
|
}
|
|
}
|
|
|
|
|
|
-PDFJS.version = '1.0.416';
|
|
|
|
-PDFJS.build = '7055671';
|
|
|
|
|
|
+PDFJS.version = '1.0.418';
|
|
|
|
+PDFJS.build = '3ad58db';
|
|
|
|
|
|
(function pdfjsWrapper() {
|
|
(function pdfjsWrapper() {
|
|
// Use strict in our context only - users might not want it
|
|
// Use strict in our context only - users might not want it
|
|
@@ -22052,7 +22052,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|
var name = args[0].name;
|
|
var name = args[0].name;
|
|
if (imageCache.key === name) {
|
|
if (imageCache.key === name) {
|
|
operatorList.addOp(imageCache.fn, imageCache.args);
|
|
operatorList.addOp(imageCache.fn, imageCache.args);
|
|
- args = [];
|
|
|
|
|
|
+ args = null;
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -22076,7 +22076,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|
} else if (type.name === 'Image') {
|
|
} else if (type.name === 'Image') {
|
|
self.buildPaintImageXObject(resources, xobj, false,
|
|
self.buildPaintImageXObject(resources, xobj, false,
|
|
operatorList, name, imageCache);
|
|
operatorList, name, imageCache);
|
|
- args = [];
|
|
|
|
|
|
+ args = null;
|
|
continue;
|
|
continue;
|
|
} else if (type.name === 'PS') {
|
|
} else if (type.name === 'PS') {
|
|
// PostScript XObjects are unused when viewing documents.
|
|
// PostScript XObjects are unused when viewing documents.
|
|
@@ -22102,12 +22102,12 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|
var cacheKey = args[0].cacheKey;
|
|
var cacheKey = args[0].cacheKey;
|
|
if (cacheKey && imageCache.key === cacheKey) {
|
|
if (cacheKey && imageCache.key === cacheKey) {
|
|
operatorList.addOp(imageCache.fn, imageCache.args);
|
|
operatorList.addOp(imageCache.fn, imageCache.args);
|
|
- args = [];
|
|
|
|
|
|
+ args = null;
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
self.buildPaintImageXObject(resources, args[0], true,
|
|
self.buildPaintImageXObject(resources, args[0], true,
|
|
operatorList, cacheKey, imageCache);
|
|
operatorList, cacheKey, imageCache);
|
|
- args = [];
|
|
|
|
|
|
+ args = null;
|
|
continue;
|
|
continue;
|
|
case OPS.showText:
|
|
case OPS.showText:
|
|
args[0] = self.handleText(args[0], stateManager.state);
|
|
args[0] = self.handleText(args[0], stateManager.state);
|
|
@@ -23498,7 +23498,9 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
|
|
},
|
|
},
|
|
|
|
|
|
read: function EvaluatorPreprocessor_read(operation) {
|
|
read: function EvaluatorPreprocessor_read(operation) {
|
|
- var args = [];
|
|
|
|
|
|
+ // We use an array to represent args, except we use |null| to represent
|
|
|
|
+ // no args because it's more compact than an empty array.
|
|
|
|
+ var args = null;
|
|
while (true) {
|
|
while (true) {
|
|
var obj = this.parser.getObj();
|
|
var obj = this.parser.getObj();
|
|
if (isEOF(obj)) {
|
|
if (isEOF(obj)) {
|
|
@@ -23507,6 +23509,9 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
|
|
if (!isCmd(obj)) {
|
|
if (!isCmd(obj)) {
|
|
// argument
|
|
// argument
|
|
if (obj !== null) {
|
|
if (obj !== null) {
|
|
|
|
+ if (!args) {
|
|
|
|
+ args = [];
|
|
|
|
+ }
|
|
args.push((obj instanceof Dict ? obj.getAll() : obj));
|
|
args.push((obj instanceof Dict ? obj.getAll() : obj));
|
|
assert(args.length <= 33, 'Too many arguments');
|
|
assert(args.length <= 33, 'Too many arguments');
|
|
}
|
|
}
|
|
@@ -23526,28 +23531,34 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
|
|
|
|
|
|
if (!opSpec.variableArgs) {
|
|
if (!opSpec.variableArgs) {
|
|
// Some post script commands can be nested, e.g. /F2 /GS2 gs 5.711 Tf
|
|
// Some post script commands can be nested, e.g. /F2 /GS2 gs 5.711 Tf
|
|
- if (args.length !== numArgs) {
|
|
|
|
|
|
+ var argsLength = args !== null ? args.length : 0;
|
|
|
|
+ if (argsLength !== numArgs) {
|
|
var nonProcessedArgs = this.nonProcessedArgs;
|
|
var nonProcessedArgs = this.nonProcessedArgs;
|
|
- while (args.length > numArgs) {
|
|
|
|
|
|
+ while (argsLength > numArgs) {
|
|
nonProcessedArgs.push(args.shift());
|
|
nonProcessedArgs.push(args.shift());
|
|
|
|
+ argsLength--;
|
|
}
|
|
}
|
|
- while (args.length < numArgs && nonProcessedArgs.length !== 0) {
|
|
|
|
|
|
+ while (argsLength < numArgs && nonProcessedArgs.length !== 0) {
|
|
|
|
+ if (!args) {
|
|
|
|
+ args = [];
|
|
|
|
+ }
|
|
args.unshift(nonProcessedArgs.pop());
|
|
args.unshift(nonProcessedArgs.pop());
|
|
|
|
+ argsLength++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- if (args.length < numArgs) {
|
|
|
|
|
|
+ if (argsLength < numArgs) {
|
|
// If we receive too few args, it's not possible to possible
|
|
// If we receive too few args, it's not possible to possible
|
|
// to execute the command, so skip the command
|
|
// to execute the command, so skip the command
|
|
info('Command ' + fn + ': because expected ' +
|
|
info('Command ' + fn + ': because expected ' +
|
|
- numArgs + ' args, but received ' + args.length +
|
|
|
|
|
|
+ numArgs + ' args, but received ' + argsLength +
|
|
' args; skipping');
|
|
' args; skipping');
|
|
- args = [];
|
|
|
|
|
|
+ args = null;
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- } else if (args.length > numArgs) {
|
|
|
|
|
|
+ } else if (argsLength > numArgs) {
|
|
info('Command ' + fn + ': expected [0,' + numArgs +
|
|
info('Command ' + fn + ': expected [0,' + numArgs +
|
|
- '] args, but received ' + args.length + ' args');
|
|
|
|
|
|
+ '] args, but received ' + argsLength + ' args');
|
|
}
|
|
}
|
|
|
|
|
|
// TODO figure out how to type-check vararg functions
|
|
// TODO figure out how to type-check vararg functions
|