Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/core/catalog.js
Original file line number Diff line number Diff line change
Expand Up @@ -1798,6 +1798,17 @@ class ExtendedCatalog extends Catalog {
return shadow(this, "structTreeRootObject", structTreeRoot);
}

convertString(str, type) {
try {
return stringToUTF8String(str);
} catch (e) {
/*console.log(
`Failed to convert string "${str}" (${type}) to UTF-8, using safe conversion. Error: ${e}`
);*/
return stringToPDFString(str);
}
}

getTreeElement(el, page, ref) {
try {
// update page for current element
Expand All @@ -1817,8 +1828,8 @@ class ExtendedCatalog extends Catalog {
const roleName = this.getRoleName(el, name);

const treeElement = {
name: name ? stringToPDFString(name) : null,
roleName: roleName ? stringToPDFString(roleName) : null,
name: name ? this.convertString(name, "Name") : null,
roleName: roleName ? this.convertString(roleName, "Role name") : null,
children: this.getTreeElement(el.get("K"), page, el.getRaw("K")),
pageIndex: page,
ref: ref instanceof Ref ? ref : null,
Expand All @@ -1829,7 +1840,7 @@ class ExtendedCatalog extends Catalog {
alt = el.has("ActualText") ? el.get("ActualText") : null;
}
if (typeof alt === "string") {
treeElement.alt = stringToPDFString(alt);
treeElement.alt = this.convertString(alt, "Alt");
}

return treeElement;
Expand Down Expand Up @@ -1903,8 +1914,8 @@ class ExtendedCatalog extends Catalog {
const roleName = this.getRoleName(el, name);

const treeElement = {
name: name ? stringToPDFString(name) : null,
roleName: roleName ? stringToPDFString(roleName) : null,
name: name ? this.convertString(name, "Name") : null,
roleName: roleName ? this.convertString(roleName, "Role name") : null,
children: [],
pageIndex: page,
ref: ref instanceof Ref ? ref : null,
Expand All @@ -1915,7 +1926,7 @@ class ExtendedCatalog extends Catalog {
alt = el.has("ActualText") ? el.get("ActualText") : null;
}
if (typeof alt === "string") {
treeElement.alt = stringToPDFString(alt);
treeElement.alt = this.convertString(alt, "Alt");
}

return treeElement;
Expand Down
Loading