2015-11-22 01:32:47 +09:00
|
|
|
/* Copyright 2012 Mozilla Foundation
|
|
|
|
*
|
|
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
* you may not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
* limitations under the License.
|
|
|
|
*/
|
|
|
|
/* uses XRef */
|
|
|
|
|
2019-05-26 00:40:14 +09:00
|
|
|
import { assert } from '../shared/util';
|
|
|
|
|
2017-01-27 21:34:37 +09:00
|
|
|
var EOF = {};
|
|
|
|
|
2015-11-22 01:32:47 +09:00
|
|
|
var Name = (function NameClosure() {
|
2019-05-26 21:20:31 +09:00
|
|
|
let nameCache = Object.create(null);
|
|
|
|
|
2015-11-22 01:32:47 +09:00
|
|
|
function Name(name) {
|
|
|
|
this.name = name;
|
|
|
|
}
|
|
|
|
|
|
|
|
Name.prototype = {};
|
|
|
|
|
|
|
|
Name.get = function Name_get(name) {
|
|
|
|
var nameValue = nameCache[name];
|
|
|
|
return (nameValue ? nameValue : (nameCache[name] = new Name(name)));
|
|
|
|
};
|
|
|
|
|
2019-05-26 21:20:31 +09:00
|
|
|
Name._clearCache = function() {
|
|
|
|
nameCache = Object.create(null);
|
|
|
|
};
|
|
|
|
|
2015-11-22 01:32:47 +09:00
|
|
|
return Name;
|
|
|
|
})();
|
|
|
|
|
|
|
|
var Cmd = (function CmdClosure() {
|
2019-05-26 21:20:31 +09:00
|
|
|
let cmdCache = Object.create(null);
|
|
|
|
|
2015-11-22 01:32:47 +09:00
|
|
|
function Cmd(cmd) {
|
|
|
|
this.cmd = cmd;
|
|
|
|
}
|
|
|
|
|
|
|
|
Cmd.prototype = {};
|
|
|
|
|
|
|
|
Cmd.get = function Cmd_get(cmd) {
|
|
|
|
var cmdValue = cmdCache[cmd];
|
|
|
|
return (cmdValue ? cmdValue : (cmdCache[cmd] = new Cmd(cmd)));
|
|
|
|
};
|
|
|
|
|
2019-05-26 21:20:31 +09:00
|
|
|
Cmd._clearCache = function() {
|
|
|
|
cmdCache = Object.create(null);
|
|
|
|
};
|
|
|
|
|
2015-11-22 01:32:47 +09:00
|
|
|
return Cmd;
|
|
|
|
})();
|
|
|
|
|
|
|
|
var Dict = (function DictClosure() {
|
|
|
|
var nonSerializable = function nonSerializableClosure() {
|
|
|
|
return nonSerializable; // creating closure on some variable
|
|
|
|
};
|
|
|
|
|
|
|
|
// xref is optional
|
|
|
|
function Dict(xref) {
|
|
|
|
// Map should only be used internally, use functions below to access.
|
2017-06-13 17:25:33 +09:00
|
|
|
this._map = Object.create(null);
|
2015-11-22 01:32:47 +09:00
|
|
|
this.xref = xref;
|
|
|
|
this.objId = null;
|
2016-09-23 21:10:27 +09:00
|
|
|
this.suppressEncryption = false;
|
2015-11-22 01:32:47 +09:00
|
|
|
this.__nonSerializable__ = nonSerializable; // disable cloning of the Dict
|
|
|
|
}
|
|
|
|
|
|
|
|
Dict.prototype = {
|
|
|
|
assignXref: function Dict_assignXref(newXref) {
|
|
|
|
this.xref = newXref;
|
|
|
|
},
|
|
|
|
|
|
|
|
// automatically dereferences Ref objects
|
|
|
|
get: function Dict_get(key1, key2, key3) {
|
|
|
|
var value;
|
2016-09-23 21:10:27 +09:00
|
|
|
var xref = this.xref, suppressEncryption = this.suppressEncryption;
|
2017-06-13 17:25:33 +09:00
|
|
|
if (typeof (value = this._map[key1]) !== 'undefined' ||
|
|
|
|
key1 in this._map || typeof key2 === 'undefined') {
|
2016-09-23 21:10:27 +09:00
|
|
|
return xref ? xref.fetchIfRef(value, suppressEncryption) : value;
|
2015-11-22 01:32:47 +09:00
|
|
|
}
|
2017-06-13 17:25:33 +09:00
|
|
|
if (typeof (value = this._map[key2]) !== 'undefined' ||
|
|
|
|
key2 in this._map || typeof key3 === 'undefined') {
|
2016-09-23 21:10:27 +09:00
|
|
|
return xref ? xref.fetchIfRef(value, suppressEncryption) : value;
|
2015-11-22 01:32:47 +09:00
|
|
|
}
|
2019-09-23 18:41:19 +09:00
|
|
|
value = this._map[key3];
|
2016-09-23 21:10:27 +09:00
|
|
|
return xref ? xref.fetchIfRef(value, suppressEncryption) : value;
|
2015-11-22 01:32:47 +09:00
|
|
|
},
|
|
|
|
|
|
|
|
// Same as get(), but returns a promise and uses fetchIfRefAsync().
|
|
|
|
getAsync: function Dict_getAsync(key1, key2, key3) {
|
|
|
|
var value;
|
2016-09-23 21:10:27 +09:00
|
|
|
var xref = this.xref, suppressEncryption = this.suppressEncryption;
|
2017-06-13 17:25:33 +09:00
|
|
|
if (typeof (value = this._map[key1]) !== 'undefined' ||
|
|
|
|
key1 in this._map || typeof key2 === 'undefined') {
|
2015-11-22 01:32:47 +09:00
|
|
|
if (xref) {
|
2016-09-23 21:10:27 +09:00
|
|
|
return xref.fetchIfRefAsync(value, suppressEncryption);
|
2015-11-22 01:32:47 +09:00
|
|
|
}
|
|
|
|
return Promise.resolve(value);
|
|
|
|
}
|
2017-06-13 17:25:33 +09:00
|
|
|
if (typeof (value = this._map[key2]) !== 'undefined' ||
|
|
|
|
key2 in this._map || typeof key3 === 'undefined') {
|
2015-11-22 01:32:47 +09:00
|
|
|
if (xref) {
|
2016-09-23 21:10:27 +09:00
|
|
|
return xref.fetchIfRefAsync(value, suppressEncryption);
|
2015-11-22 01:32:47 +09:00
|
|
|
}
|
|
|
|
return Promise.resolve(value);
|
|
|
|
}
|
2019-09-23 18:41:19 +09:00
|
|
|
value = this._map[key3];
|
2015-11-22 01:32:47 +09:00
|
|
|
if (xref) {
|
2016-09-23 21:10:27 +09:00
|
|
|
return xref.fetchIfRefAsync(value, suppressEncryption);
|
2015-11-22 01:32:47 +09:00
|
|
|
}
|
|
|
|
return Promise.resolve(value);
|
|
|
|
},
|
|
|
|
|
|
|
|
// Same as get(), but dereferences all elements if the result is an Array.
|
|
|
|
getArray: function Dict_getArray(key1, key2, key3) {
|
|
|
|
var value = this.get(key1, key2, key3);
|
2016-09-23 21:10:27 +09:00
|
|
|
var xref = this.xref, suppressEncryption = this.suppressEncryption;
|
2017-09-02 03:27:13 +09:00
|
|
|
if (!Array.isArray(value) || !xref) {
|
2015-11-22 01:32:47 +09:00
|
|
|
return value;
|
|
|
|
}
|
|
|
|
value = value.slice(); // Ensure that we don't modify the Dict data.
|
|
|
|
for (var i = 0, ii = value.length; i < ii; i++) {
|
|
|
|
if (!isRef(value[i])) {
|
|
|
|
continue;
|
|
|
|
}
|
2016-09-23 21:10:27 +09:00
|
|
|
value[i] = xref.fetch(value[i], suppressEncryption);
|
2015-11-22 01:32:47 +09:00
|
|
|
}
|
|
|
|
return value;
|
|
|
|
},
|
|
|
|
|
|
|
|
// no dereferencing
|
|
|
|
getRaw: function Dict_getRaw(key) {
|
2017-06-13 17:25:33 +09:00
|
|
|
return this._map[key];
|
2015-11-22 01:32:47 +09:00
|
|
|
},
|
|
|
|
|
|
|
|
getKeys: function Dict_getKeys() {
|
2017-06-13 17:25:33 +09:00
|
|
|
return Object.keys(this._map);
|
2015-11-22 01:32:47 +09:00
|
|
|
},
|
|
|
|
|
|
|
|
set: function Dict_set(key, value) {
|
2017-06-13 17:25:33 +09:00
|
|
|
this._map[key] = value;
|
2015-11-22 01:32:47 +09:00
|
|
|
},
|
|
|
|
|
|
|
|
has: function Dict_has(key) {
|
2017-06-13 17:25:33 +09:00
|
|
|
return key in this._map;
|
2015-11-22 01:32:47 +09:00
|
|
|
},
|
|
|
|
|
|
|
|
forEach: function Dict_forEach(callback) {
|
2017-06-13 17:25:33 +09:00
|
|
|
for (var key in this._map) {
|
2015-11-22 01:32:47 +09:00
|
|
|
callback(key, this.get(key));
|
|
|
|
}
|
Fix inconsistent spacing and trailing commas in objects in `src/core/` files, so we can enable the `comma-dangle` and `object-curly-spacing` ESLint rules later on
*Unfortunately this patch is fairly big, even though it only covers the `src/core` folder, but splitting it even further seemed difficult.*
http://eslint.org/docs/rules/comma-dangle
http://eslint.org/docs/rules/object-curly-spacing
Given that we currently have quite inconsistent object formatting, fixing this in *one* big patch probably wouldn't be feasible (since I cannot imagine anyone wanting to review that); hence I've opted to try and do this piecewise instead.
Please note: This patch was created automatically, using the ESLint --fix command line option. In a couple of places this caused lines to become too long, and I've fixed those manually; please refer to the interdiff below for the only hand-edits in this patch.
```diff
diff --git a/src/core/evaluator.js b/src/core/evaluator.js
index abab9027..dcd3594b 100644
--- a/src/core/evaluator.js
+++ b/src/core/evaluator.js
@@ -2785,7 +2785,8 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
t['Tz'] = { id: OPS.setHScale, numArgs: 1, variableArgs: false, };
t['TL'] = { id: OPS.setLeading, numArgs: 1, variableArgs: false, };
t['Tf'] = { id: OPS.setFont, numArgs: 2, variableArgs: false, };
- t['Tr'] = { id: OPS.setTextRenderingMode, numArgs: 1, variableArgs: false, };
+ t['Tr'] = { id: OPS.setTextRenderingMode, numArgs: 1,
+ variableArgs: false, };
t['Ts'] = { id: OPS.setTextRise, numArgs: 1, variableArgs: false, };
t['Td'] = { id: OPS.moveText, numArgs: 2, variableArgs: false, };
t['TD'] = { id: OPS.setLeadingMoveText, numArgs: 2, variableArgs: false, };
diff --git a/src/core/jbig2.js b/src/core/jbig2.js
index 5a17d482..71671541 100644
--- a/src/core/jbig2.js
+++ b/src/core/jbig2.js
@@ -123,19 +123,22 @@ var Jbig2Image = (function Jbig2ImageClosure() {
{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, }, { x: -2, y: 0, },
{ x: -1, y: 0, }],
[{ x: -3, y: -1, }, { x: -2, y: -1, }, { x: -1, y: -1, }, { x: 0, y: -1, },
- { x: 1, y: -1, }, { x: -4, y: 0, }, { x: -3, y: 0, }, { x: -2, y: 0, }, { x: -1, y: 0, }]
+ { x: 1, y: -1, }, { x: -4, y: 0, }, { x: -3, y: 0, }, { x: -2, y: 0, },
+ { x: -1, y: 0, }]
];
var RefinementTemplates = [
{
coding: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }],
- reference: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, },
- { x: 1, y: 0, }, { x: -1, y: 1, }, { x: 0, y: 1, }, { x: 1, y: 1, }],
+ reference: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, },
+ { x: 0, y: 0, }, { x: 1, y: 0, }, { x: -1, y: 1, },
+ { x: 0, y: 1, }, { x: 1, y: 1, }],
},
{
- coding: [{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }],
- reference: [{ x: 0, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, }, { x: 1, y: 0, },
- { x: 0, y: 1, }, { x: 1, y: 1, }],
+ coding: [{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, },
+ { x: -1, y: 0, }],
+ reference: [{ x: 0, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, },
+ { x: 1, y: 0, }, { x: 0, y: 1, }, { x: 1, y: 1, }],
}
];
```
2017-06-02 18:16:24 +09:00
|
|
|
},
|
2015-11-22 01:32:47 +09:00
|
|
|
};
|
|
|
|
|
|
|
|
Dict.empty = new Dict(null);
|
|
|
|
|
2017-06-13 17:25:33 +09:00
|
|
|
Dict.merge = function(xref, dictArray) {
|
|
|
|
let mergedDict = new Dict(xref);
|
2015-11-22 01:32:47 +09:00
|
|
|
|
2017-06-13 17:25:33 +09:00
|
|
|
for (let i = 0, ii = dictArray.length; i < ii; i++) {
|
|
|
|
let dict = dictArray[i];
|
2015-11-22 01:32:47 +09:00
|
|
|
if (!isDict(dict)) {
|
|
|
|
continue;
|
|
|
|
}
|
2017-06-13 17:25:33 +09:00
|
|
|
for (let keyName in dict._map) {
|
|
|
|
if (mergedDict._map[keyName] !== undefined) {
|
2015-11-22 01:32:47 +09:00
|
|
|
continue;
|
|
|
|
}
|
2017-06-13 17:25:33 +09:00
|
|
|
mergedDict._map[keyName] = dict._map[keyName];
|
2015-11-22 01:32:47 +09:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return mergedDict;
|
|
|
|
};
|
|
|
|
|
|
|
|
return Dict;
|
|
|
|
})();
|
|
|
|
|
|
|
|
var Ref = (function RefClosure() {
|
2019-05-26 21:20:31 +09:00
|
|
|
let refCache = Object.create(null);
|
2019-05-26 00:40:14 +09:00
|
|
|
|
2015-11-22 01:32:47 +09:00
|
|
|
function Ref(num, gen) {
|
|
|
|
this.num = num;
|
|
|
|
this.gen = gen;
|
|
|
|
}
|
|
|
|
|
|
|
|
Ref.prototype = {
|
|
|
|
toString: function Ref_toString() {
|
|
|
|
// This function is hot, so we make the string as compact as possible.
|
|
|
|
// |this.gen| is almost always zero, so we treat that case specially.
|
2019-05-26 00:40:14 +09:00
|
|
|
if (this.gen === 0) {
|
|
|
|
return `${this.num}R`;
|
2015-11-22 01:32:47 +09:00
|
|
|
}
|
2019-05-26 00:40:14 +09:00
|
|
|
return `${this.num}R${this.gen}`;
|
Fix inconsistent spacing and trailing commas in objects in `src/core/` files, so we can enable the `comma-dangle` and `object-curly-spacing` ESLint rules later on
*Unfortunately this patch is fairly big, even though it only covers the `src/core` folder, but splitting it even further seemed difficult.*
http://eslint.org/docs/rules/comma-dangle
http://eslint.org/docs/rules/object-curly-spacing
Given that we currently have quite inconsistent object formatting, fixing this in *one* big patch probably wouldn't be feasible (since I cannot imagine anyone wanting to review that); hence I've opted to try and do this piecewise instead.
Please note: This patch was created automatically, using the ESLint --fix command line option. In a couple of places this caused lines to become too long, and I've fixed those manually; please refer to the interdiff below for the only hand-edits in this patch.
```diff
diff --git a/src/core/evaluator.js b/src/core/evaluator.js
index abab9027..dcd3594b 100644
--- a/src/core/evaluator.js
+++ b/src/core/evaluator.js
@@ -2785,7 +2785,8 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
t['Tz'] = { id: OPS.setHScale, numArgs: 1, variableArgs: false, };
t['TL'] = { id: OPS.setLeading, numArgs: 1, variableArgs: false, };
t['Tf'] = { id: OPS.setFont, numArgs: 2, variableArgs: false, };
- t['Tr'] = { id: OPS.setTextRenderingMode, numArgs: 1, variableArgs: false, };
+ t['Tr'] = { id: OPS.setTextRenderingMode, numArgs: 1,
+ variableArgs: false, };
t['Ts'] = { id: OPS.setTextRise, numArgs: 1, variableArgs: false, };
t['Td'] = { id: OPS.moveText, numArgs: 2, variableArgs: false, };
t['TD'] = { id: OPS.setLeadingMoveText, numArgs: 2, variableArgs: false, };
diff --git a/src/core/jbig2.js b/src/core/jbig2.js
index 5a17d482..71671541 100644
--- a/src/core/jbig2.js
+++ b/src/core/jbig2.js
@@ -123,19 +123,22 @@ var Jbig2Image = (function Jbig2ImageClosure() {
{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, }, { x: -2, y: 0, },
{ x: -1, y: 0, }],
[{ x: -3, y: -1, }, { x: -2, y: -1, }, { x: -1, y: -1, }, { x: 0, y: -1, },
- { x: 1, y: -1, }, { x: -4, y: 0, }, { x: -3, y: 0, }, { x: -2, y: 0, }, { x: -1, y: 0, }]
+ { x: 1, y: -1, }, { x: -4, y: 0, }, { x: -3, y: 0, }, { x: -2, y: 0, },
+ { x: -1, y: 0, }]
];
var RefinementTemplates = [
{
coding: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }],
- reference: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, },
- { x: 1, y: 0, }, { x: -1, y: 1, }, { x: 0, y: 1, }, { x: 1, y: 1, }],
+ reference: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, },
+ { x: 0, y: 0, }, { x: 1, y: 0, }, { x: -1, y: 1, },
+ { x: 0, y: 1, }, { x: 1, y: 1, }],
},
{
- coding: [{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }],
- reference: [{ x: 0, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, }, { x: 1, y: 0, },
- { x: 0, y: 1, }, { x: 1, y: 1, }],
+ coding: [{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, },
+ { x: -1, y: 0, }],
+ reference: [{ x: 0, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, },
+ { x: 1, y: 0, }, { x: 0, y: 1, }, { x: 1, y: 1, }],
}
];
```
2017-06-02 18:16:24 +09:00
|
|
|
},
|
2015-11-22 01:32:47 +09:00
|
|
|
};
|
|
|
|
|
2019-05-26 00:40:14 +09:00
|
|
|
Ref.get = function(num, gen) {
|
|
|
|
const key = (gen === 0 ? `${num}R` : `${num}R${gen}`);
|
|
|
|
const refValue = refCache[key];
|
|
|
|
return (refValue ? refValue : (refCache[key] = new Ref(num, gen)));
|
|
|
|
};
|
|
|
|
|
2019-05-26 21:20:31 +09:00
|
|
|
Ref._clearCache = function() {
|
|
|
|
refCache = Object.create(null);
|
|
|
|
};
|
|
|
|
|
2015-11-22 01:32:47 +09:00
|
|
|
return Ref;
|
|
|
|
})();
|
|
|
|
|
|
|
|
// The reference is identified by number and generation.
|
|
|
|
// This structure stores only one instance of the reference.
|
|
|
|
var RefSet = (function RefSetClosure() {
|
|
|
|
function RefSet() {
|
2016-01-28 02:04:13 +09:00
|
|
|
this.dict = Object.create(null);
|
2015-11-22 01:32:47 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
RefSet.prototype = {
|
|
|
|
has: function RefSet_has(ref) {
|
|
|
|
return ref.toString() in this.dict;
|
|
|
|
},
|
|
|
|
|
|
|
|
put: function RefSet_put(ref) {
|
|
|
|
this.dict[ref.toString()] = true;
|
|
|
|
},
|
|
|
|
|
|
|
|
remove: function RefSet_remove(ref) {
|
|
|
|
delete this.dict[ref.toString()];
|
Fix inconsistent spacing and trailing commas in objects in `src/core/` files, so we can enable the `comma-dangle` and `object-curly-spacing` ESLint rules later on
*Unfortunately this patch is fairly big, even though it only covers the `src/core` folder, but splitting it even further seemed difficult.*
http://eslint.org/docs/rules/comma-dangle
http://eslint.org/docs/rules/object-curly-spacing
Given that we currently have quite inconsistent object formatting, fixing this in *one* big patch probably wouldn't be feasible (since I cannot imagine anyone wanting to review that); hence I've opted to try and do this piecewise instead.
Please note: This patch was created automatically, using the ESLint --fix command line option. In a couple of places this caused lines to become too long, and I've fixed those manually; please refer to the interdiff below for the only hand-edits in this patch.
```diff
diff --git a/src/core/evaluator.js b/src/core/evaluator.js
index abab9027..dcd3594b 100644
--- a/src/core/evaluator.js
+++ b/src/core/evaluator.js
@@ -2785,7 +2785,8 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
t['Tz'] = { id: OPS.setHScale, numArgs: 1, variableArgs: false, };
t['TL'] = { id: OPS.setLeading, numArgs: 1, variableArgs: false, };
t['Tf'] = { id: OPS.setFont, numArgs: 2, variableArgs: false, };
- t['Tr'] = { id: OPS.setTextRenderingMode, numArgs: 1, variableArgs: false, };
+ t['Tr'] = { id: OPS.setTextRenderingMode, numArgs: 1,
+ variableArgs: false, };
t['Ts'] = { id: OPS.setTextRise, numArgs: 1, variableArgs: false, };
t['Td'] = { id: OPS.moveText, numArgs: 2, variableArgs: false, };
t['TD'] = { id: OPS.setLeadingMoveText, numArgs: 2, variableArgs: false, };
diff --git a/src/core/jbig2.js b/src/core/jbig2.js
index 5a17d482..71671541 100644
--- a/src/core/jbig2.js
+++ b/src/core/jbig2.js
@@ -123,19 +123,22 @@ var Jbig2Image = (function Jbig2ImageClosure() {
{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, }, { x: -2, y: 0, },
{ x: -1, y: 0, }],
[{ x: -3, y: -1, }, { x: -2, y: -1, }, { x: -1, y: -1, }, { x: 0, y: -1, },
- { x: 1, y: -1, }, { x: -4, y: 0, }, { x: -3, y: 0, }, { x: -2, y: 0, }, { x: -1, y: 0, }]
+ { x: 1, y: -1, }, { x: -4, y: 0, }, { x: -3, y: 0, }, { x: -2, y: 0, },
+ { x: -1, y: 0, }]
];
var RefinementTemplates = [
{
coding: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }],
- reference: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, },
- { x: 1, y: 0, }, { x: -1, y: 1, }, { x: 0, y: 1, }, { x: 1, y: 1, }],
+ reference: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, },
+ { x: 0, y: 0, }, { x: 1, y: 0, }, { x: -1, y: 1, },
+ { x: 0, y: 1, }, { x: 1, y: 1, }],
},
{
- coding: [{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }],
- reference: [{ x: 0, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, }, { x: 1, y: 0, },
- { x: 0, y: 1, }, { x: 1, y: 1, }],
+ coding: [{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, },
+ { x: -1, y: 0, }],
+ reference: [{ x: 0, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, },
+ { x: 1, y: 0, }, { x: 0, y: 1, }, { x: 1, y: 1, }],
}
];
```
2017-06-02 18:16:24 +09:00
|
|
|
},
|
2015-11-22 01:32:47 +09:00
|
|
|
};
|
|
|
|
|
|
|
|
return RefSet;
|
|
|
|
})();
|
|
|
|
|
|
|
|
var RefSetCache = (function RefSetCacheClosure() {
|
|
|
|
function RefSetCache() {
|
|
|
|
this.dict = Object.create(null);
|
|
|
|
}
|
|
|
|
|
|
|
|
RefSetCache.prototype = {
|
|
|
|
get: function RefSetCache_get(ref) {
|
|
|
|
return this.dict[ref.toString()];
|
|
|
|
},
|
|
|
|
|
|
|
|
has: function RefSetCache_has(ref) {
|
|
|
|
return ref.toString() in this.dict;
|
|
|
|
},
|
|
|
|
|
|
|
|
put: function RefSetCache_put(ref, obj) {
|
|
|
|
this.dict[ref.toString()] = obj;
|
|
|
|
},
|
|
|
|
|
|
|
|
putAlias: function RefSetCache_putAlias(ref, aliasRef) {
|
|
|
|
this.dict[ref.toString()] = this.get(aliasRef);
|
|
|
|
},
|
|
|
|
|
|
|
|
forEach: function RefSetCache_forEach(fn, thisArg) {
|
|
|
|
for (var i in this.dict) {
|
|
|
|
fn.call(thisArg, this.dict[i]);
|
|
|
|
}
|
|
|
|
},
|
|
|
|
|
|
|
|
clear: function RefSetCache_clear() {
|
|
|
|
this.dict = Object.create(null);
|
Fix inconsistent spacing and trailing commas in objects in `src/core/` files, so we can enable the `comma-dangle` and `object-curly-spacing` ESLint rules later on
*Unfortunately this patch is fairly big, even though it only covers the `src/core` folder, but splitting it even further seemed difficult.*
http://eslint.org/docs/rules/comma-dangle
http://eslint.org/docs/rules/object-curly-spacing
Given that we currently have quite inconsistent object formatting, fixing this in *one* big patch probably wouldn't be feasible (since I cannot imagine anyone wanting to review that); hence I've opted to try and do this piecewise instead.
Please note: This patch was created automatically, using the ESLint --fix command line option. In a couple of places this caused lines to become too long, and I've fixed those manually; please refer to the interdiff below for the only hand-edits in this patch.
```diff
diff --git a/src/core/evaluator.js b/src/core/evaluator.js
index abab9027..dcd3594b 100644
--- a/src/core/evaluator.js
+++ b/src/core/evaluator.js
@@ -2785,7 +2785,8 @@ var EvaluatorPreprocessor = (function EvaluatorPreprocessorClosure() {
t['Tz'] = { id: OPS.setHScale, numArgs: 1, variableArgs: false, };
t['TL'] = { id: OPS.setLeading, numArgs: 1, variableArgs: false, };
t['Tf'] = { id: OPS.setFont, numArgs: 2, variableArgs: false, };
- t['Tr'] = { id: OPS.setTextRenderingMode, numArgs: 1, variableArgs: false, };
+ t['Tr'] = { id: OPS.setTextRenderingMode, numArgs: 1,
+ variableArgs: false, };
t['Ts'] = { id: OPS.setTextRise, numArgs: 1, variableArgs: false, };
t['Td'] = { id: OPS.moveText, numArgs: 2, variableArgs: false, };
t['TD'] = { id: OPS.setLeadingMoveText, numArgs: 2, variableArgs: false, };
diff --git a/src/core/jbig2.js b/src/core/jbig2.js
index 5a17d482..71671541 100644
--- a/src/core/jbig2.js
+++ b/src/core/jbig2.js
@@ -123,19 +123,22 @@ var Jbig2Image = (function Jbig2ImageClosure() {
{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, }, { x: -2, y: 0, },
{ x: -1, y: 0, }],
[{ x: -3, y: -1, }, { x: -2, y: -1, }, { x: -1, y: -1, }, { x: 0, y: -1, },
- { x: 1, y: -1, }, { x: -4, y: 0, }, { x: -3, y: 0, }, { x: -2, y: 0, }, { x: -1, y: 0, }]
+ { x: 1, y: -1, }, { x: -4, y: 0, }, { x: -3, y: 0, }, { x: -2, y: 0, },
+ { x: -1, y: 0, }]
];
var RefinementTemplates = [
{
coding: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }],
- reference: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, },
- { x: 1, y: 0, }, { x: -1, y: 1, }, { x: 0, y: 1, }, { x: 1, y: 1, }],
+ reference: [{ x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, },
+ { x: 0, y: 0, }, { x: 1, y: 0, }, { x: -1, y: 1, },
+ { x: 0, y: 1, }, { x: 1, y: 1, }],
},
{
- coding: [{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, }, { x: -1, y: 0, }],
- reference: [{ x: 0, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, }, { x: 1, y: 0, },
- { x: 0, y: 1, }, { x: 1, y: 1, }],
+ coding: [{ x: -1, y: -1, }, { x: 0, y: -1, }, { x: 1, y: -1, },
+ { x: -1, y: 0, }],
+ reference: [{ x: 0, y: -1, }, { x: -1, y: 0, }, { x: 0, y: 0, },
+ { x: 1, y: 0, }, { x: 0, y: 1, }, { x: 1, y: 1, }],
}
];
```
2017-06-02 18:16:24 +09:00
|
|
|
},
|
2015-11-22 01:32:47 +09:00
|
|
|
};
|
|
|
|
|
|
|
|
return RefSetCache;
|
|
|
|
})();
|
|
|
|
|
2017-01-27 21:34:37 +09:00
|
|
|
function isEOF(v) {
|
|
|
|
return (v === EOF);
|
|
|
|
}
|
|
|
|
|
2016-08-04 21:57:31 +09:00
|
|
|
function isName(v, name) {
|
|
|
|
return v instanceof Name && (name === undefined || v.name === name);
|
2015-11-22 01:32:47 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
function isCmd(v, cmd) {
|
|
|
|
return v instanceof Cmd && (cmd === undefined || v.cmd === cmd);
|
|
|
|
}
|
|
|
|
|
|
|
|
function isDict(v, type) {
|
2016-08-04 21:57:31 +09:00
|
|
|
return v instanceof Dict &&
|
|
|
|
(type === undefined || isName(v.get('Type'), type));
|
2015-11-22 01:32:47 +09:00
|
|
|
}
|
|
|
|
|
|
|
|
function isRef(v) {
|
|
|
|
return v instanceof Ref;
|
|
|
|
}
|
|
|
|
|
2016-05-16 23:28:25 +09:00
|
|
|
function isRefsEqual(v1, v2) {
|
2019-05-26 00:40:14 +09:00
|
|
|
if (typeof PDFJSDev === 'undefined' ||
|
|
|
|
PDFJSDev.test('!PRODUCTION || TESTING')) {
|
|
|
|
assert(v1 instanceof Ref && v2 instanceof Ref,
|
|
|
|
'isRefsEqual: Both parameters should be `Ref`s.');
|
|
|
|
}
|
2016-05-16 23:28:25 +09:00
|
|
|
return v1.num === v2.num && v1.gen === v2.gen;
|
|
|
|
}
|
|
|
|
|
2015-11-22 01:32:47 +09:00
|
|
|
function isStream(v) {
|
|
|
|
return typeof v === 'object' && v !== null && v.getBytes !== undefined;
|
|
|
|
}
|
|
|
|
|
2019-05-26 21:20:31 +09:00
|
|
|
function clearPrimitiveCaches() {
|
|
|
|
Cmd._clearCache();
|
|
|
|
Name._clearCache();
|
|
|
|
Ref._clearCache();
|
|
|
|
}
|
|
|
|
|
2017-04-02 23:14:30 +09:00
|
|
|
export {
|
|
|
|
EOF,
|
2019-05-26 21:20:31 +09:00
|
|
|
clearPrimitiveCaches,
|
2017-04-02 23:14:30 +09:00
|
|
|
Cmd,
|
|
|
|
Dict,
|
|
|
|
Name,
|
|
|
|
Ref,
|
|
|
|
RefSet,
|
|
|
|
RefSetCache,
|
|
|
|
isEOF,
|
|
|
|
isCmd,
|
|
|
|
isDict,
|
|
|
|
isName,
|
|
|
|
isRef,
|
|
|
|
isRefsEqual,
|
|
|
|
isStream,
|
|
|
|
};
|