|
@@ -23,8 +23,8 @@
|
|
}
|
|
}
|
|
}(this, function (exports) {
|
|
}(this, function (exports) {
|
|
'use strict';
|
|
'use strict';
|
|
- var pdfjsVersion = '1.6.428';
|
|
|
|
- var pdfjsBuild = 'e259bc2';
|
|
|
|
|
|
+ var pdfjsVersion = '1.6.430';
|
|
|
|
+ var pdfjsBuild = 'f828f07';
|
|
var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : null;
|
|
var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : null;
|
|
var pdfjsLibs = {};
|
|
var pdfjsLibs = {};
|
|
(function pdfjsWrapper() {
|
|
(function pdfjsWrapper() {
|
|
@@ -51769,13 +51769,12 @@
|
|
var cs = ColorSpace.parse(dict.get('ColorSpace', 'CS'), xref, res);
|
|
var cs = ColorSpace.parse(dict.get('ColorSpace', 'CS'), xref, res);
|
|
return (cs.numComps === 1 || cs.numComps === 3) && cs.isDefaultDecode(dict.getArray('Decode', 'D'));
|
|
return (cs.numComps === 1 || cs.numComps === 3) && cs.isDefaultDecode(dict.getArray('Decode', 'D'));
|
|
};
|
|
};
|
|
- function PartialEvaluator(pdfManager, xref, handler, pageIndex, uniquePrefix, idCounters, fontCache, options) {
|
|
|
|
|
|
+ function PartialEvaluator(pdfManager, xref, handler, pageIndex, idFactory, fontCache, options) {
|
|
this.pdfManager = pdfManager;
|
|
this.pdfManager = pdfManager;
|
|
this.xref = xref;
|
|
this.xref = xref;
|
|
this.handler = handler;
|
|
this.handler = handler;
|
|
this.pageIndex = pageIndex;
|
|
this.pageIndex = pageIndex;
|
|
- this.uniquePrefix = uniquePrefix;
|
|
|
|
- this.idCounters = idCounters;
|
|
|
|
|
|
+ this.idFactory = idFactory;
|
|
this.fontCache = fontCache;
|
|
this.fontCache = fontCache;
|
|
this.options = options || DefaultPartialEvaluatorOptions;
|
|
this.options = options || DefaultPartialEvaluatorOptions;
|
|
}
|
|
}
|
|
@@ -51938,8 +51937,7 @@
|
|
operatorList.addOp(OPS.paintInlineImageXObject, [imgData]);
|
|
operatorList.addOp(OPS.paintInlineImageXObject, [imgData]);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- var uniquePrefix = this.uniquePrefix || '';
|
|
|
|
- var objId = 'img_' + uniquePrefix + ++this.idCounters.obj;
|
|
|
|
|
|
+ var objId = 'img_' + this.idFactory.createObjId();
|
|
operatorList.addDependency(objId);
|
|
operatorList.addDependency(objId);
|
|
args = [
|
|
args = [
|
|
objId,
|
|
objId,
|
|
@@ -52223,7 +52221,7 @@
|
|
this.fontCache.put(fontRef, fontCapability.promise);
|
|
this.fontCache.put(fontRef, fontCapability.promise);
|
|
} else {
|
|
} else {
|
|
if (!fontID) {
|
|
if (!fontID) {
|
|
- fontID = (this.uniquePrefix || 'F_') + ++this.idCounters.obj;
|
|
|
|
|
|
+ fontID = this.idFactory.createObjId();
|
|
}
|
|
}
|
|
this.fontCache.put('id_' + fontID, fontCapability.promise);
|
|
this.fontCache.put('id_' + fontID, fontCapability.promise);
|
|
}
|
|
}
|
|
@@ -54628,12 +54626,12 @@
|
|
function AnnotationFactory() {
|
|
function AnnotationFactory() {
|
|
}
|
|
}
|
|
AnnotationFactory.prototype = {
|
|
AnnotationFactory.prototype = {
|
|
- create: function AnnotationFactory_create(xref, ref, pdfManager, uniquePrefix, idCounters) {
|
|
|
|
|
|
+ create: function AnnotationFactory_create(xref, ref, pdfManager, idFactory) {
|
|
var dict = xref.fetchIfRef(ref);
|
|
var dict = xref.fetchIfRef(ref);
|
|
if (!isDict(dict)) {
|
|
if (!isDict(dict)) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- var id = isRef(ref) ? ref.toString() : 'annot_' + (uniquePrefix || '') + ++idCounters.obj;
|
|
|
|
|
|
+ var id = isRef(ref) ? ref.toString() : 'annot_' + idFactory.createObjId();
|
|
var subtype = dict.get('Subtype');
|
|
var subtype = dict.get('Subtype');
|
|
subtype = isName(subtype) ? subtype.name : null;
|
|
subtype = isName(subtype) ? subtype.name : null;
|
|
var parameters = {
|
|
var parameters = {
|
|
@@ -55333,10 +55331,15 @@
|
|
this.xref = xref;
|
|
this.xref = xref;
|
|
this.ref = ref;
|
|
this.ref = ref;
|
|
this.fontCache = fontCache;
|
|
this.fontCache = fontCache;
|
|
- this.uniquePrefix = 'p' + this.pageIndex + '_';
|
|
|
|
- this.idCounters = { obj: 0 };
|
|
|
|
this.evaluatorOptions = pdfManager.evaluatorOptions;
|
|
this.evaluatorOptions = pdfManager.evaluatorOptions;
|
|
this.resourcesPromise = null;
|
|
this.resourcesPromise = null;
|
|
|
|
+ var uniquePrefix = 'p' + this.pageIndex + '_';
|
|
|
|
+ var idCounters = { obj: 0 };
|
|
|
|
+ this.idFactory = {
|
|
|
|
+ createObjId: function () {
|
|
|
|
+ return uniquePrefix + ++idCounters.obj;
|
|
|
|
+ }
|
|
|
|
+ };
|
|
}
|
|
}
|
|
Page.prototype = {
|
|
Page.prototype = {
|
|
getPageProp: function Page_getPageProp(key) {
|
|
getPageProp: function Page_getPageProp(key) {
|
|
@@ -55453,7 +55456,7 @@
|
|
'XObject',
|
|
'XObject',
|
|
'Font'
|
|
'Font'
|
|
]);
|
|
]);
|
|
- var partialEvaluator = new PartialEvaluator(pdfManager, this.xref, handler, this.pageIndex, this.uniquePrefix, this.idCounters, this.fontCache, this.evaluatorOptions);
|
|
|
|
|
|
+ var partialEvaluator = new PartialEvaluator(pdfManager, this.xref, handler, this.pageIndex, this.idFactory, this.fontCache, this.evaluatorOptions);
|
|
var dataPromises = Promise.all([
|
|
var dataPromises = Promise.all([
|
|
contentStreamPromise,
|
|
contentStreamPromise,
|
|
resourcesPromise
|
|
resourcesPromise
|
|
@@ -55509,7 +55512,7 @@
|
|
]);
|
|
]);
|
|
return dataPromises.then(function (data) {
|
|
return dataPromises.then(function (data) {
|
|
var contentStream = data[0];
|
|
var contentStream = data[0];
|
|
- var partialEvaluator = new PartialEvaluator(pdfManager, self.xref, handler, self.pageIndex, self.uniquePrefix, self.idCounters, self.fontCache, self.evaluatorOptions);
|
|
|
|
|
|
+ var partialEvaluator = new PartialEvaluator(pdfManager, self.xref, handler, self.pageIndex, self.idFactory, self.fontCache, self.evaluatorOptions);
|
|
return partialEvaluator.getTextContent(contentStream, task, self.resources, null, normalizeWhitespace, combineTextItems);
|
|
return partialEvaluator.getTextContent(contentStream, task, self.resources, null, normalizeWhitespace, combineTextItems);
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -55532,7 +55535,7 @@
|
|
var annotationFactory = new AnnotationFactory();
|
|
var annotationFactory = new AnnotationFactory();
|
|
for (var i = 0, n = annotationRefs.length; i < n; ++i) {
|
|
for (var i = 0, n = annotationRefs.length; i < n; ++i) {
|
|
var annotationRef = annotationRefs[i];
|
|
var annotationRef = annotationRefs[i];
|
|
- var annotation = annotationFactory.create(this.xref, annotationRef, this.pdfManager, this.uniquePrefix, this.idCounters);
|
|
|
|
|
|
+ var annotation = annotationFactory.create(this.xref, annotationRef, this.pdfManager, this.idFactory);
|
|
if (annotation) {
|
|
if (annotation) {
|
|
annotations.push(annotation);
|
|
annotations.push(annotation);
|
|
}
|
|
}
|