From f5c01188dc8fbb586664bf68ef492c26813d5253 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Mon, 22 Jan 2024 12:22:48 +0100 Subject: [PATCH] Convert the `PartialEvaluator.extractDataStructures` method to be async --- src/core/evaluator.js | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/core/evaluator.js b/src/core/evaluator.js index 1958a3520..4c0b29543 100644 --- a/src/core/evaluator.js +++ b/src/core/evaluator.js @@ -3428,7 +3428,7 @@ class PartialEvaluator { }); } - extractDataStructures(dict, baseDict, properties) { + async extractDataStructures(dict, baseDict, properties) { const xref = this.xref; let cidToGidBytes; // 9.10.2 @@ -3554,21 +3554,19 @@ class PartialEvaluator { properties.baseEncodingName = baseEncodingName; properties.hasEncoding = !!baseEncodingName || differences.length > 0; properties.dict = dict; - return toUnicodePromise - .then(readToUnicode => { - properties.toUnicode = readToUnicode; - return this.buildToUnicode(properties); - }) - .then(builtToUnicode => { - properties.toUnicode = builtToUnicode; - if (cidToGidBytes) { - properties.cidToGidMap = this.readCidToGidMap( - cidToGidBytes, - builtToUnicode - ); - } - return properties; - }); + + properties.toUnicode = await toUnicodePromise; + + const builtToUnicode = await this.buildToUnicode(properties); + properties.toUnicode = builtToUnicode; + + if (cidToGidBytes) { + properties.cidToGidMap = this.readCidToGidMap( + cidToGidBytes, + builtToUnicode + ); + } + return properties; } /**