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

Merge pull request #12526 from Snuffleupagus/TilingPattern-args

Browse Source 
Improve argument/name handling when parsing TilingPatterns (PR 12458 follow-up)
This commit is contained in:
Tim van der Meij 2020-10-24 15:47:57 +02:00 committed by GitHub
commit 180f35ee91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/evaluator.js
View File

@ -1224,10 +1224,12 @@ class PartialEvaluator {
localTilingPatternCache localTilingPatternCache
) { ) {
// compile tiling patterns // compile tiling patterns
const patternName = args[args.length - 1]; const patternName = args.pop();
// SCN/scn applies patterns along with normal colors // SCN/scn applies patterns along with normal colors
if (patternName instanceof Name) { if (patternName instanceof Name) {
const localTilingPattern = localTilingPatternCache.getByName(patternName); const name = patternName.name;
const localTilingPattern = localTilingPatternCache.getByName(name);
if (localTilingPattern) { if (localTilingPattern) {
try { try {
const color = cs.base ? cs.base.getRgb(args, 0) : null; const color = cs.base ? cs.base.getRgb(args, 0) : null;
@ -1249,7 +1251,7 @@ class PartialEvaluator {
// if and only if there are PDF documents where doing so would // if and only if there are PDF documents where doing so would
// significantly improve performance. // significantly improve performance.
let pattern = patterns.get(patternName.name); let pattern = patterns.get(name);
if (pattern) { if (pattern) {
var dict = isStream(pattern) ? pattern.dict : pattern; var dict = isStream(pattern) ? pattern.dict : pattern;
var typeNum = dict.get("PatternType"); var typeNum = dict.get("PatternType");
@ -1264,7 +1266,7 @@ class PartialEvaluator {
dict, dict,
operatorList, operatorList,
task, task,
patternName, /* cacheKey = */ name,
localTilingPatternCache localTilingPatternCache
); );
} else if (typeNum === PatternType.SHADING) { } else if (typeNum === PatternType.SHADING) {