mirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-26 10:08:06 +02:00
Code Activity

Add a new BaseStream.getString(...) method to replace manual bytesToString(BaseStream.getBytes(...)) calls

Browse source 
Given that the `bytesToString(BaseStream.getBytes(...))` pattern is somewhat common throughout the `src/core/` code, it cannot hurt to add a new `BaseStream`-method which handles that case internally.
This commit is contained in:
Jonas Jenwald 2021-05-01 12:11:09 +02:00
parent f6f335173d
commit 3624f9eac7
6 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/core/catalog.js
View file

@ -13,23 +13,6 @@
* limitations under the License.
*/
import {
bytesToString,
createPromiseCapability,
createValidAbsoluteUrl,
DocumentActionEventType,
FormatError,
info,
isBool,
isNum,
isString,
objectSize,
PermissionFlag,
shadow,
stringToPDFString,
stringToUTF8String,
warn,
} from "../shared/util.js";
import {
clearPrimitiveCaches,
Dict,
@ -46,6 +29,22 @@ import {
MissingDataException,
toRomanNumerals,
} from "./core_utils.js";
import {
createPromiseCapability,
createValidAbsoluteUrl,
DocumentActionEventType,
FormatError,
info,
isBool,
isNum,
isString,
objectSize,
PermissionFlag,
shadow,
stringToPDFString,
stringToUTF8String,
warn,
} from "../shared/util.js";
import { NameTree, NumberTree } from "./name_number_tree.js";
import { ColorSpace } from "./colorspace.js";
import { FileSpec } from "./file_spec.js";
@ -136,7 +135,7 @@ class Catalog {
// charsets, let's just hope that the author of the PDF was reasonable
// enough to stick with the XML default charset, which is UTF-8.
try {
const data = stringToUTF8String(bytesToString(stream.getBytes()));
const data = stringToUTF8String(stream.getString());
if (data) {
metadata = new MetadataParser(data).serializable;
}
@ -906,7 +905,7 @@ class Catalog {
let js = jsDict.get("JS");
if (isStream(js)) {
js = bytesToString(js.getBytes());
js = js.getString();
} else if (typeof js !== "string") {
return;
}
@ -1344,7 +1343,7 @@ class Catalog {
let js;
if (isStream(jsAction)) {
js = bytesToString(jsAction.getBytes());
js = jsAction.getString();
} else if (isString(jsAction)) {
js = jsAction;
}