Marmelator/pdf.js.mirror
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2026-06-24 00:45:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21431 from Snuffleupagus/more-isDict

Browse Source 
Use the `isDict` helper function in a few more places
This commit is contained in:
Jonas Jenwald 2026-06-12 23:32:22 +02:00 committed by GitHub
commit 5873e1cbc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/editor/pdf_editor.js
View File

@ -27,7 +27,15 @@ import {
getNewAnnotationsMap, getNewAnnotationsMap,
numberToString, numberToString,
} from "../core_utils.js"; } from "../core_utils.js";
import { Dict, isName, Name, Ref, RefSet, RefSetCache } from "../primitives.js"; import {
Dict,
isDict,
isName,
Name,
Ref,
RefSet,
RefSetCache,
} from "../primitives.js";
import { incrementalUpdate, writeValue } from "../writer.js"; import { incrementalUpdate, writeValue } from "../writer.js";
import { isArrayEqual, stringToBytes } from "../../shared/util.js"; import { isArrayEqual, stringToBytes } from "../../shared/util.js";
import { NameTree, NumberTree } from "../name_number_tree.js"; import { NameTree, NumberTree } from "../name_number_tree.js";
@ -280,11 +288,7 @@ class PDFEditor {
oldRefMapping.put(oldRef, newRef); oldRefMapping.put(oldRef, newRef);
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) { if (typeof PDFJSDev === "undefined" || PDFJSDev.test("TESTING")) {
if ( if (isDict(obj, "Page") && !this.currentDocument.pagesMap.has(oldRef)) {
obj instanceof Dict &&
isName(obj.get("Type"), "Page") &&
!this.currentDocument.pagesMap.has(oldRef)
) {
throw new Error( throw new Error(
"Add a deleted page to the document is not supported." "Add a deleted page to the document is not supported."
); );

7
src/core/struct_tree.js
View File

@ -19,7 +19,7 @@ import {
stringToUTF8String, stringToUTF8String,
warn, warn,
} from "../shared/util.js"; } from "../shared/util.js";
import { Dict, isName, Name, Ref, RefSetCache } from "./primitives.js"; import { Dict, isDict, isName, Name, Ref, RefSetCache } from "./primitives.js";
import { stringToAsciiOrUTF16BE, stringToPDFString } from "./string_utils.js"; import { stringToAsciiOrUTF16BE, stringToPDFString } from "./string_utils.js";
import { BaseStream } from "./base_stream.js"; import { BaseStream } from "./base_stream.js";
import { lookupNormalRect } from "./core_utils.js"; import { lookupNormalRect } from "./core_utils.js";
@ -594,10 +594,7 @@ class StructElementNode {
} }
for (let af of AFs) { for (let af of AFs) {
af = this.xref.fetchIfRef(af); af = this.xref.fetchIfRef(af);
if (!(af instanceof Dict)) { if (!isDict(af, "Filespec")) {
continue;
}
if (!isName(af.get("Type"), "Filespec")) {
continue; continue;
} }
if (!isName(af.get("AFRelationship"), "Supplement")) { if (!isName(af.get("AFRelationship"), "Supplement")) {