Add a getRawValues
method, to Dict
instances, to provide an easier way of getting all *raw* values
When the old `Dict.getAll()` method was removed, it was replaced with a `Dict.getKeys()` call and `Dict.get(...)` calls (in a loop). While this pattern obviously makes a lot of sense in many cases, there's some instances where we actually want the *raw* `Dict` values (i.e. `Ref`s where applicable). In those cases, `Dict.getRaw(...)` calls are instead used within the loop. However, by introducing a new `Dict.getRawValues()` method we can reduce the number of (strictly unnecessary) function calls by simply getting the *raw* `Dict` values directly.
This commit is contained in:
parent
6381b5b08f
commit
ea8e432c45
@ -254,8 +254,7 @@ class PartialEvaluator {
|
|||||||
// First check the current resources for blend modes.
|
// First check the current resources for blend modes.
|
||||||
var graphicStates = node.get("ExtGState");
|
var graphicStates = node.get("ExtGState");
|
||||||
if (graphicStates instanceof Dict) {
|
if (graphicStates instanceof Dict) {
|
||||||
for (const key of graphicStates.getKeys()) {
|
for (let graphicState of graphicStates.getRawValues()) {
|
||||||
let graphicState = graphicStates.getRaw(key);
|
|
||||||
if (graphicState instanceof Ref) {
|
if (graphicState instanceof Ref) {
|
||||||
if (processed.has(graphicState)) {
|
if (processed.has(graphicState)) {
|
||||||
continue; // The ExtGState has already been processed.
|
continue; // The ExtGState has already been processed.
|
||||||
@ -301,8 +300,7 @@ class PartialEvaluator {
|
|||||||
if (!(xObjects instanceof Dict)) {
|
if (!(xObjects instanceof Dict)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
for (const key of xObjects.getKeys()) {
|
for (let xObject of xObjects.getRawValues()) {
|
||||||
var xObject = xObjects.getRaw(key);
|
|
||||||
if (xObject instanceof Ref) {
|
if (xObject instanceof Ref) {
|
||||||
if (processed.has(xObject)) {
|
if (processed.has(xObject)) {
|
||||||
// The XObject has already been processed, and by avoiding a
|
// The XObject has already been processed, and by avoiding a
|
||||||
@ -3078,9 +3076,7 @@ class PartialEvaluator {
|
|||||||
} else if (isRef(encoding)) {
|
} else if (isRef(encoding)) {
|
||||||
hash.update(encoding.toString());
|
hash.update(encoding.toString());
|
||||||
} else if (isDict(encoding)) {
|
} else if (isDict(encoding)) {
|
||||||
var keys = encoding.getKeys();
|
for (const entry of encoding.getRawValues()) {
|
||||||
for (var i = 0, ii = keys.length; i < ii; i++) {
|
|
||||||
var entry = encoding.getRaw(keys[i]);
|
|
||||||
if (isName(entry)) {
|
if (isName(entry)) {
|
||||||
hash.update(entry.name);
|
hash.update(entry.name);
|
||||||
} else if (isRef(entry)) {
|
} else if (isRef(entry)) {
|
||||||
|
@ -2207,16 +2207,13 @@ const ObjectLoader = (function () {
|
|||||||
function addChildren(node, nodesToVisit) {
|
function addChildren(node, nodesToVisit) {
|
||||||
if (node instanceof Dict || isStream(node)) {
|
if (node instanceof Dict || isStream(node)) {
|
||||||
const dict = node instanceof Dict ? node : node.dict;
|
const dict = node instanceof Dict ? node : node.dict;
|
||||||
const dictKeys = dict.getKeys();
|
for (const rawValue of dict.getRawValues()) {
|
||||||
for (let i = 0, ii = dictKeys.length; i < ii; i++) {
|
|
||||||
const rawValue = dict.getRaw(dictKeys[i]);
|
|
||||||
if (mayHaveChildren(rawValue)) {
|
if (mayHaveChildren(rawValue)) {
|
||||||
nodesToVisit.push(rawValue);
|
nodesToVisit.push(rawValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (Array.isArray(node)) {
|
} else if (Array.isArray(node)) {
|
||||||
for (let i = 0, ii = node.length; i < ii; i++) {
|
for (const value of node) {
|
||||||
const value = node[i];
|
|
||||||
if (mayHaveChildren(value)) {
|
if (mayHaveChildren(value)) {
|
||||||
nodesToVisit.push(value);
|
nodesToVisit.push(value);
|
||||||
}
|
}
|
||||||
|
@ -144,6 +144,11 @@ var Dict = (function DictClosure() {
|
|||||||
return Object.keys(this._map);
|
return Object.keys(this._map);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// no dereferencing
|
||||||
|
getRawValues: function Dict_getRawValues() {
|
||||||
|
return Object.values(this._map);
|
||||||
|
},
|
||||||
|
|
||||||
set: function Dict_set(key, value) {
|
set: function Dict_set(key, value) {
|
||||||
if (
|
if (
|
||||||
(typeof PDFJSDev === "undefined" ||
|
(typeof PDFJSDev === "undefined" ||
|
||||||
|
@ -275,6 +275,35 @@ describe("primitives", function () {
|
|||||||
expect(keys.sort()).toEqual(expectedKeys);
|
expect(keys.sort()).toEqual(expectedKeys);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("should get all raw values", function () {
|
||||||
|
// Test direct objects:
|
||||||
|
const expectedRawValues1 = [testFontFile, testFontFile2, testFontFile3];
|
||||||
|
const rawValues1 = dictWithManyKeys.getRawValues();
|
||||||
|
|
||||||
|
expect(rawValues1.sort()).toEqual(expectedRawValues1);
|
||||||
|
|
||||||
|
// Test indirect objects:
|
||||||
|
const typeName = Name.get("Page");
|
||||||
|
const resources = new Dict(null),
|
||||||
|
resourcesRef = Ref.get(5, 0);
|
||||||
|
const contents = new StringStream("data"),
|
||||||
|
contentsRef = Ref.get(10, 0);
|
||||||
|
const xref = new XRefMock([
|
||||||
|
{ ref: resourcesRef, data: resources },
|
||||||
|
{ ref: contentsRef, data: contents },
|
||||||
|
]);
|
||||||
|
|
||||||
|
const dict = new Dict(xref);
|
||||||
|
dict.set("Type", typeName);
|
||||||
|
dict.set("Resources", resourcesRef);
|
||||||
|
dict.set("Contents", contentsRef);
|
||||||
|
|
||||||
|
const expectedRawValues2 = [contentsRef, resourcesRef, typeName];
|
||||||
|
const rawValues2 = dict.getRawValues();
|
||||||
|
|
||||||
|
expect(rawValues2.sort()).toEqual(expectedRawValues2);
|
||||||
|
});
|
||||||
|
|
||||||
it("should create only one object for Dict.empty", function () {
|
it("should create only one object for Dict.empty", function () {
|
||||||
const firstDictEmpty = Dict.empty;
|
const firstDictEmpty = Dict.empty;
|
||||||
const secondDictEmpty = Dict.empty;
|
const secondDictEmpty = Dict.empty;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user