|
|
@@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfCombined = {}));
|
|
|
// Use strict in our context only - users might not want it
|
|
|
'use strict';
|
|
|
|
|
|
-var pdfjsVersion = '1.5.378';
|
|
|
-var pdfjsBuild = '084fc51';
|
|
|
+var pdfjsVersion = '1.5.381';
|
|
|
+var pdfjsBuild = 'b4c8814';
|
|
|
|
|
|
var pdfjsFilePath =
|
|
|
typeof document !== 'undefined' && document.currentScript ?
|
|
|
@@ -17685,8 +17685,8 @@ var RefSetCache = (function RefSetCacheClosure() {
|
|
|
return RefSetCache;
|
|
|
})();
|
|
|
|
|
|
-function isName(v) {
|
|
|
- return v instanceof Name;
|
|
|
+function isName(v, name) {
|
|
|
+ return v instanceof Name && (name === undefined || v.name === name);
|
|
|
}
|
|
|
|
|
|
function isCmd(v, cmd) {
|
|
|
@@ -17694,14 +17694,8 @@ function isCmd(v, cmd) {
|
|
|
}
|
|
|
|
|
|
function isDict(v, type) {
|
|
|
- if (!(v instanceof Dict)) {
|
|
|
- return false;
|
|
|
- }
|
|
|
- if (!type) {
|
|
|
- return true;
|
|
|
- }
|
|
|
- var dictType = v.get('Type');
|
|
|
- return isName(dictType) && dictType.name === type;
|
|
|
+ return v instanceof Dict &&
|
|
|
+ (type === undefined || isName(v.get('Type'), type));
|
|
|
}
|
|
|
|
|
|
function isRef(v) {
|
|
|
@@ -27502,7 +27496,7 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
|
|
|
|
|
|
function CipherTransformFactory(dict, fileId, password) {
|
|
|
var filter = dict.get('Filter');
|
|
|
- if (!isName(filter) || filter.name !== 'Standard') {
|
|
|
+ if (!isName(filter, 'Standard')) {
|
|
|
error('unknown encryption method');
|
|
|
}
|
|
|
this.dict = dict;
|
|
|
@@ -42819,8 +42813,7 @@ var Catalog = (function CatalogClosure() {
|
|
|
var type = stream.dict.get('Type');
|
|
|
var subtype = stream.dict.get('Subtype');
|
|
|
|
|
|
- if (isName(type) && isName(subtype) &&
|
|
|
- type.name === 'Metadata' && subtype.name === 'XML') {
|
|
|
+ if (isName(type, 'Metadata') && isName(subtype, 'XML')) {
|
|
|
// XXX: This should examine the charset the XML document defines,
|
|
|
// however since there are currently no real means to decode
|
|
|
// arbitrary charsets, let's just hope that the author of the PDF
|
|
|
@@ -43029,7 +43022,7 @@ var Catalog = (function CatalogClosure() {
|
|
|
assert(isDict(labelDict), 'The PageLabel is not a dictionary.');
|
|
|
|
|
|
var type = labelDict.get('Type');
|
|
|
- assert(!type || (isName(type) && type.name === 'PageLabel'),
|
|
|
+ assert(!type || isName(type, 'PageLabel'),
|
|
|
'Invalid type in PageLabel dictionary.');
|
|
|
|
|
|
var s = labelDict.get('S');
|
|
|
@@ -43107,7 +43100,7 @@ var Catalog = (function CatalogClosure() {
|
|
|
var javaScript = [];
|
|
|
function appendIfJavaScriptDict(jsDict) {
|
|
|
var type = jsDict.get('S');
|
|
|
- if (!isName(type) || type.name !== 'JavaScript') {
|
|
|
+ if (!isName(type, 'JavaScript')) {
|
|
|
return;
|
|
|
}
|
|
|
var js = jsDict.get('JS');
|
|
|
@@ -43135,11 +43128,11 @@ var Catalog = (function CatalogClosure() {
|
|
|
var openactionDict = this.catDict.get('OpenAction');
|
|
|
if (isDict(openactionDict, 'Action')) {
|
|
|
var actionType = openactionDict.get('S');
|
|
|
- if (isName(actionType) && actionType.name === 'Named') {
|
|
|
+ if (isName(actionType, 'Named')) {
|
|
|
// The named Print action is not a part of the PDF 1.7 specification,
|
|
|
// but is supported by many PDF readers/writers (including Adobe's).
|
|
|
var action = openactionDict.get('N');
|
|
|
- if (isName(action) && action.name === 'Print') {
|
|
|
+ if (isName(action, 'Print')) {
|
|
|
javaScript.push('print({});');
|
|
|
}
|
|
|
} else {
|
|
|
@@ -45412,7 +45405,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|
|
|
|
|
var groupSubtype = group.get('S');
|
|
|
var colorSpace;
|
|
|
- if (isName(groupSubtype) && groupSubtype.name === 'Transparency') {
|
|
|
+ if (isName(groupSubtype, 'Transparency')) {
|
|
|
groupOptions.isolated = (group.get('I') || false);
|
|
|
groupOptions.knockout = (group.get('K') || false);
|
|
|
colorSpace = (group.has('CS') ?
|
|
|
@@ -45707,7 +45700,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|
|
gStateObj.push([key, value]);
|
|
|
break;
|
|
|
case 'SMask':
|
|
|
- if (isName(value) && value.name === 'None') {
|
|
|
+ if (isName(value, 'None')) {
|
|
|
gStateObj.push([key, false]);
|
|
|
break;
|
|
|
}
|
|
|
@@ -46015,8 +46008,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|
|
assert(isStream(xobj), 'XObject should be a stream');
|
|
|
|
|
|
var type = xobj.dict.get('Subtype');
|
|
|
- assert(isName(type),
|
|
|
- 'XObject should have a Name subtype');
|
|
|
+ assert(isName(type), 'XObject should have a Name subtype');
|
|
|
|
|
|
if (type.name === 'Form') {
|
|
|
stateManager.save();
|
|
|
@@ -46727,8 +46719,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|
|
assert(isStream(xobj), 'XObject should be a stream');
|
|
|
|
|
|
var type = xobj.dict.get('Subtype');
|
|
|
- assert(isName(type),
|
|
|
- 'XObject should have a Name subtype');
|
|
|
+ assert(isName(type), 'XObject should have a Name subtype');
|
|
|
|
|
|
if ('Form' !== type.name) {
|
|
|
xobjsCache.key = name;
|
|
|
@@ -48497,7 +48488,7 @@ AnnotationFactory.prototype = /** @lends AnnotationFactory.prototype */ {
|
|
|
|
|
|
case 'Widget':
|
|
|
var fieldType = Util.getInheritableProperty(dict, 'FT');
|
|
|
- if (isName(fieldType) && fieldType.name === 'Tx') {
|
|
|
+ if (isName(fieldType, 'Tx')) {
|
|
|
return new TextWidgetAnnotation(parameters);
|
|
|
}
|
|
|
return new WidgetAnnotation(parameters);
|
|
|
@@ -48742,10 +48733,9 @@ var Annotation = (function AnnotationClosure() {
|
|
|
}
|
|
|
if (borderStyle.has('BS')) {
|
|
|
var dict = borderStyle.get('BS');
|
|
|
- var dictType;
|
|
|
+ var dictType = dict.get('Type');
|
|
|
|
|
|
- if (!dict.has('Type') || (isName(dictType = dict.get('Type')) &&
|
|
|
- dictType.name === 'Border')) {
|
|
|
+ if (!dictType || isName(dictType, 'Border')) {
|
|
|
this.borderStyle.setWidth(dict.get('W'));
|
|
|
this.borderStyle.setStyle(dict.get('S'));
|
|
|
this.borderStyle.setDashArray(dict.getArray('D'));
|
Pdf Bot