Merge pull request #6954 from Snuffleupagus/setGState-fixes

Various `setGState` improvements
This commit is contained in:
Tim van der Meij 2016-02-10 00:38:31 +01:00
commit 03f12a10b5

View File

@ -468,11 +468,12 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
xref, stateManager) {
// This array holds the converted/processed state data.
var gStateObj = [];
var gStateMap = gState.map;
var gStateKeys = gState.getKeys();
var self = this;
var promise = Promise.resolve();
for (var key in gStateMap) {
var value = gStateMap[key];
for (var i = 0, ii = gStateKeys.length; i < ii; i++) {
var key = gStateKeys[i];
var value = gState.get(key);
switch (key) {
case 'Type':
break;
@ -505,12 +506,11 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
gStateObj.push([key, false]);
break;
}
var dict = xref.fetchIfRef(value);
if (isDict(dict)) {
promise = promise.then(function () {
if (isDict(value)) {
promise = promise.then(function (dict) {
return self.handleSMask(dict, resources, operatorList,
task, stateManager);
});
}.bind(this, value));
gStateObj.push([key, true]);
} else {
warn('Unsupported SMask type');
@ -542,7 +542,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
}
}
return promise.then(function () {
if (gStateObj.length >= 0) {
if (gStateObj.length > 0) {
operatorList.addOp(OPS.setGState, [gStateObj]);
}
});