From 4cdb5f7be0fce4759fae25de777367be462ce0b9 Mon Sep 17 00:00:00 2001 From: Pdf Bot Date: Wed, 17 Aug 2016 14:51:17 +0100 Subject: [PATCH] PDF.js version 1.5.381 - See mozilla/pdf.js@b4c8814fc9b346cce38b224389bf4cf971a752b8 --- bower.json | 2 +- build/pdf.combined.js | 48 +++++++++++++++++-------------------------- build/pdf.js | 4 ++-- build/pdf.worker.js | 48 +++++++++++++++++-------------------------- package.json | 2 +- 5 files changed, 42 insertions(+), 62 deletions(-) diff --git a/bower.json b/bower.json index a1f51c22a..a0806e80e 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.5.378", + "version": "1.5.381", "main": [ "build/pdf.js", "build/pdf.worker.js" diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 8d6f85000..f2edc11e6 100644 --- a/build/pdf.combined.js +++ b/build/pdf.combined.js @@ -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')); diff --git a/build/pdf.js b/build/pdf.js index 61d7ec127..f2cec63f3 100644 --- a/build/pdf.js +++ b/build/pdf.js @@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdf = {})); // 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 ? diff --git a/build/pdf.worker.js b/build/pdf.worker.js index d7f408620..9dfa9409e 100644 --- a/build/pdf.worker.js +++ b/build/pdf.worker.js @@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfWorker = {})); // 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) { @@ -24071,7 +24065,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; @@ -34470,8 +34464,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 @@ -34680,7 +34673,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'); @@ -34758,7 +34751,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'); @@ -34786,11 +34779,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 { @@ -37063,7 +37056,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') ? @@ -37358,7 +37351,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; } @@ -37666,8 +37659,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(); @@ -38378,8 +38370,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; @@ -40148,7 +40139,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); @@ -40393,10 +40384,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')); diff --git a/package.json b/package.json index 4537d7e1e..91b87f7f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.5.378", + "version": "1.5.381", "main": "build/pdf.js", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [