mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-26 01:58:06 +02:00
Merge branch 'refs/heads/master' into filesplit
Conflicts: pdf.js
This commit is contained in:
commit
41caf5018d
5 changed files with 22 additions and 15 deletions
|
@ -246,7 +246,7 @@ var PartialEvaluator = (function partialEvaluator() {
|
|||
}
|
||||
|
||||
var fnArray = queue.fnArray, argsArray = queue.argsArray;
|
||||
var dependency = dependency || [];
|
||||
var dependencyArray = dependency || [];
|
||||
|
||||
resources = xref.fetchIfRef(resources) || new Dict();
|
||||
var xobjs = xref.fetchIfRef(resources.get('XObject')) || new Dict();
|
||||
|
@ -293,13 +293,14 @@ var PartialEvaluator = (function partialEvaluator() {
|
|||
|
||||
if (typeNum == TILING_PATTERN) {
|
||||
// Create an IR of the pattern code.
|
||||
var depIdx = dependency.length;
|
||||
var codeIR = this.getIRQueue(pattern,
|
||||
dict.get('Resources'), {}, dependency);
|
||||
var depIdx = dependencyArray.length;
|
||||
var queueObj = {};
|
||||
var codeIR = this.getIRQueue(pattern, dict.get('Resources'),
|
||||
queueObj, dependencyArray);
|
||||
|
||||
// Add the dependencies that are required to execute the
|
||||
// codeIR.
|
||||
insertDependency(dependency.slice(depIdx));
|
||||
insertDependency(dependencyArray.slice(depIdx));
|
||||
|
||||
args = TilingPattern.getIR(codeIR, dict, args);
|
||||
}
|
||||
|
@ -336,14 +337,14 @@ var PartialEvaluator = (function partialEvaluator() {
|
|||
argsArray.push([matrix, bbox]);
|
||||
|
||||
// This adds the IRQueue of the xObj to the current queue.
|
||||
var depIdx = dependency.length;
|
||||
var depIdx = dependencyArray.length;
|
||||
|
||||
this.getIRQueue(xobj, xobj.dict.get('Resources'), queue,
|
||||
dependency);
|
||||
dependencyArray);
|
||||
|
||||
// Add the dependencies that are required to execute the
|
||||
// codeIR.
|
||||
insertDependency(dependency.slice(depIdx));
|
||||
insertDependency(dependencyArray.slice(depIdx));
|
||||
|
||||
fn = 'paintFormXObjectEnd';
|
||||
args = [];
|
||||
|
@ -875,9 +876,11 @@ var PartialEvaluator = (function partialEvaluator() {
|
|||
properties.resources = fontResources;
|
||||
for (var key in charProcs.map) {
|
||||
var glyphStream = xref.fetchIfRef(charProcs.map[key]);
|
||||
var queue = {};
|
||||
var queueObj = {};
|
||||
properties.glyphs[key].IRQueue = this.getIRQueue(glyphStream,
|
||||
fontResources, queue, dependency);
|
||||
fontResources,
|
||||
queueObj,
|
||||
dependency);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue