Merge pull request #13387 from Snuffleupagus/evaluator-some-no-var

Fix a few *safe* ESLint no-var failures in `src/core/evaluator.js` (13371 follow-up)
This commit is contained in:
Tim van der Meij 2021-05-16 18:17:39 +02:00 committed by GitHub
commit 2fc9f39436
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -394,7 +394,8 @@ class PartialEvaluator {
} else { } else {
bbox = null; bbox = null;
} }
let optionalContent = null; let optionalContent = null,
groupOptions;
if (dict.has("OC")) { if (dict.has("OC")) {
optionalContent = await this.parseMarkedContentProps( optionalContent = await this.parseMarkedContentProps(
dict.get("OC"), dict.get("OC"),
@ -404,7 +405,7 @@ class PartialEvaluator {
} }
const group = dict.get("Group"); const group = dict.get("Group");
if (group) { if (group) {
var groupOptions = { groupOptions = {
matrix, matrix,
bbox, bbox,
smask, smask,
@ -3766,7 +3767,7 @@ class PartialEvaluator {
throw new FormatError("invalid font name"); throw new FormatError("invalid font name");
} }
let fontFile; let fontFile, subtype, length1, length2, length3;
try { try {
fontFile = descriptor.get("FontFile", "FontFile2", "FontFile3"); fontFile = descriptor.get("FontFile", "FontFile2", "FontFile3");
} catch (ex) { } catch (ex) {
@ -3778,13 +3779,13 @@ class PartialEvaluator {
} }
if (fontFile) { if (fontFile) {
if (fontFile.dict) { if (fontFile.dict) {
var subtype = fontFile.dict.get("Subtype"); const subtypeEntry = fontFile.dict.get("Subtype");
if (subtype) { if (subtypeEntry instanceof Name) {
subtype = subtype.name; subtype = subtypeEntry.name;
} }
var length1 = fontFile.dict.get("Length1"); length1 = fontFile.dict.get("Length1");
var length2 = fontFile.dict.get("Length2"); length2 = fontFile.dict.get("Length2");
var length3 = fontFile.dict.get("Length3"); length3 = fontFile.dict.get("Length3");
} }
} }