diff --git a/src/core/evaluator.js b/src/core/evaluator.js index 1b2376b3c..a67ad4ef5 100644 --- a/src/core/evaluator.js +++ b/src/core/evaluator.js @@ -254,8 +254,7 @@ class PartialEvaluator { // First check the current resources for blend modes. var graphicStates = node.get("ExtGState"); if (graphicStates instanceof Dict) { - for (const key of graphicStates.getKeys()) { - let graphicState = graphicStates.getRaw(key); + for (let graphicState of graphicStates.getRawValues()) { if (graphicState instanceof Ref) { if (processed.has(graphicState)) { continue; // The ExtGState has already been processed. @@ -301,8 +300,7 @@ class PartialEvaluator { if (!(xObjects instanceof Dict)) { continue; } - for (const key of xObjects.getKeys()) { - var xObject = xObjects.getRaw(key); + for (let xObject of xObjects.getRawValues()) { if (xObject instanceof Ref) { if (processed.has(xObject)) { // The XObject has already been processed, and by avoiding a @@ -3078,9 +3076,7 @@ class PartialEvaluator { } else if (isRef(encoding)) { hash.update(encoding.toString()); } else if (isDict(encoding)) { - var keys = encoding.getKeys(); - for (var i = 0, ii = keys.length; i < ii; i++) { - var entry = encoding.getRaw(keys[i]); + for (const entry of encoding.getRawValues()) { if (isName(entry)) { hash.update(entry.name); } else if (isRef(entry)) { diff --git a/src/core/obj.js b/src/core/obj.js index fdaa1bd17..aa468c1e7 100644 --- a/src/core/obj.js +++ b/src/core/obj.js @@ -2207,16 +2207,13 @@ const ObjectLoader = (function () { function addChildren(node, nodesToVisit) { if (node instanceof Dict || isStream(node)) { const dict = node instanceof Dict ? node : node.dict; - const dictKeys = dict.getKeys(); - for (let i = 0, ii = dictKeys.length; i < ii; i++) { - const rawValue = dict.getRaw(dictKeys[i]); + for (const rawValue of dict.getRawValues()) { if (mayHaveChildren(rawValue)) { nodesToVisit.push(rawValue); } } } else if (Array.isArray(node)) { - for (let i = 0, ii = node.length; i < ii; i++) { - const value = node[i]; + for (const value of node) { if (mayHaveChildren(value)) { nodesToVisit.push(value); } diff --git a/src/core/primitives.js b/src/core/primitives.js index 06d0e21d9..eb53ccb82 100644 --- a/src/core/primitives.js +++ b/src/core/primitives.js @@ -144,6 +144,11 @@ var Dict = (function DictClosure() { return Object.keys(this._map); }, + // no dereferencing + getRawValues: function Dict_getRawValues() { + return Object.values(this._map); + }, + set: function Dict_set(key, value) { if ( (typeof PDFJSDev === "undefined" || diff --git a/test/unit/primitives_spec.js b/test/unit/primitives_spec.js index cbd3d01f5..7f3e375b7 100644 --- a/test/unit/primitives_spec.js +++ b/test/unit/primitives_spec.js @@ -275,6 +275,35 @@ describe("primitives", function () { 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 () { const firstDictEmpty = Dict.empty; const secondDictEmpty = Dict.empty;