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

Merge pull request #12001 from Snuffleupagus/cache-ColorSpace-locally

Browse Source 
Add local caching of `ColorSpace`s, by name, in `PartialEvaluator.getOperatorList` (issue 2504)
This commit is contained in:
Tim van der Meij 2020-06-14 13:20:13 +02:00 committed by GitHub
commit a91f24cda9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 62 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/core/evaluator.js
View File

@ -381,7 +381,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
smask, smask,
operatorList, operatorList,
task, task,
initialState initialState,
localColorSpaceCache
) { ) {
var dict = xobj.dict; var dict = xobj.dict;
var matrix = dict.getArray("Matrix"); var matrix = dict.getArray("Matrix");
@ -407,10 +408,19 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
groupOptions.isolated = group.get("I") || false; groupOptions.isolated = group.get("I") || false;
groupOptions.knockout = group.get("K") || false; groupOptions.knockout = group.get("K") || false;
if (group.has("CS")) { if (group.has("CS")) {
colorSpace = await this.parseColorSpace({ const cs = group.get("CS");
cs: group.get("CS"),
resources, const localColorSpace =
}); cs instanceof Name && localColorSpaceCache.getByName(cs.name);
if (localColorSpace) {
colorSpace = localColorSpace;
} else {
colorSpace = await this.parseColorSpace({
cs,
resources,
localColorSpaceCache,
});
}
} }
} }
@ -619,7 +629,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
resources, resources,
operatorList, operatorList,
task, task,
stateManager stateManager,
localColorSpaceCache
) { ) {
var smaskContent = smask.get("G"); var smaskContent = smask.get("G");
var smaskOptions = { var smaskOptions = {
@ -648,7 +659,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
smaskOptions, smaskOptions,
operatorList, operatorList,
task, task,
stateManager.state.clone() stateManager.state.clone(),
localColorSpaceCache
); );
}, },
@ -800,7 +812,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
gState, gState,
operatorList, operatorList,
task, task,
stateManager stateManager,
localColorSpaceCache
) { ) {
// This array holds the converted/processed state data. // This array holds the converted/processed state data.
var gStateObj = []; var gStateObj = [];
@ -853,7 +866,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
resources, resources,
operatorList, operatorList,
task, task,
stateManager stateManager,
localColorSpaceCache
); );
}); });
gStateObj.push([key, true]); gStateObj.push([key, true]);
@ -1117,11 +1131,20 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} }
}, },
parseColorSpace({ cs, resources }) { parseColorSpace({ cs, resources, localColorSpaceCache }) {
return new Promise(resolve => { return new Promise(resolve => {
resolve( const parsedColorSpace = ColorSpace.parse(
ColorSpace.parse(cs, this.xref, resources, this.pdfFunctionFactory) cs,
this.xref,
resources,
this.pdfFunctionFactory
); );
const csName = cs instanceof Name ? cs.name : null;
if (csName) {
localColorSpaceCache.set(csName, /* ref = */ null, parsedColorSpace);
}
resolve(parsedColorSpace);
}).catch(reason => { }).catch(reason => {
if (reason instanceof AbortException) { if (reason instanceof AbortException) {
return null; return null;
@ -1198,6 +1221,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
var xref = this.xref; var xref = this.xref;
let parsingText = false; let parsingText = false;
const localImageCache = new LocalImageCache(); const localImageCache = new LocalImageCache();
const localColorSpaceCache = new LocalImageCache();
var xobjs = resources.get("XObject") || Dict.empty; var xobjs = resources.get("XObject") || Dict.empty;
var patterns = resources.get("Pattern") || Dict.empty; var patterns = resources.get("Pattern") || Dict.empty;
@ -1309,7 +1333,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
null, null,
operatorList, operatorList,
task, task,
stateManager.state.clone() stateManager.state.clone(),
localColorSpaceCache
) )
.then(function () { .then(function () {
stateManager.restore(); stateManager.restore();
@ -1454,12 +1479,21 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
stateManager.state.textRenderingMode = args[0]; stateManager.state.textRenderingMode = args[0];
break; break;
case OPS.setFillColorSpace: case OPS.setFillColorSpace: {
const localColorSpace =
args[0] instanceof Name &&
localColorSpaceCache.getByName(args[0].name);
if (localColorSpace) {
stateManager.state.fillColorSpace = localColorSpace;
continue;
}
next( next(
self self
.parseColorSpace({ .parseColorSpace({
cs: args[0], cs: args[0],
resources, resources,
localColorSpaceCache,
}) })
.then(function (colorSpace) { .then(function (colorSpace) {
if (colorSpace) { if (colorSpace) {
@ -1468,12 +1502,22 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
}) })
); );
return; return;
case OPS.setStrokeColorSpace: }
case OPS.setStrokeColorSpace: {
const localColorSpace =
args[0] instanceof Name &&
localColorSpaceCache.getByName(args[0].name);
if (localColorSpace) {
stateManager.state.strokeColorSpace = localColorSpace;
continue;
}
next( next(
self self
.parseColorSpace({ .parseColorSpace({
cs: args[0], cs: args[0],
resources, resources,
localColorSpaceCache,
}) })
.then(function (colorSpace) { .then(function (colorSpace) {
if (colorSpace) { if (colorSpace) {
@ -1482,6 +1526,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
}) })
); );
return; return;
}
case OPS.setFillColor: case OPS.setFillColor:
cs = stateManager.state.fillColorSpace; cs = stateManager.state.fillColorSpace;
args = cs.getRgb(args, 0); args = cs.getRgb(args, 0);
@ -1597,7 +1642,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
gState, gState,
operatorList, operatorList,
task, task,
stateManager stateManager,
localColorSpaceCache
) )
); );
return; return;