Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Array-destructuring in the XRef.readXRefStream-method

Browse Source
This commit is contained in:
Jonas Jenwald 2021-11-26 14:11:29 +01:00
parent a2a5376adf
commit 680e0efb9d
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/xref.js
View File

@ -289,19 +289,15 @@ class XRef {
} }
readXRefStream(stream) { readXRefStream(stream) {
let i, j;
const streamState = this.streamState; const streamState = this.streamState;
stream.pos = streamState.streamPos; stream.pos = streamState.streamPos;
const byteWidths = streamState.byteWidths; const [typeFieldWidth, offsetFieldWidth, generationFieldWidth] =
const typeFieldWidth = byteWidths[0]; streamState.byteWidths;
const offsetFieldWidth = byteWidths[1];
const generationFieldWidth = byteWidths[2];
const entryRanges = streamState.entryRanges; const entryRanges = streamState.entryRanges;
while (entryRanges.length > 0) { while (entryRanges.length > 0) {
const first = entryRanges[0]; const [first, n] = entryRanges;
const n = entryRanges[1];
if (!Number.isInteger(first) || !Number.isInteger(n)) { if (!Number.isInteger(first) || !Number.isInteger(n)) {
throw new FormatError(`Invalid XRef range fields: ${first}, ${n}`); throw new FormatError(`Invalid XRef range fields: ${first}, ${n}`);
@ -315,14 +311,14 @@ class XRef {
`Invalid XRef entry fields length: ${first}, ${n}` `Invalid XRef entry fields length: ${first}, ${n}`
); );
} }
for (i = streamState.entryNum; i < n; ++i) { for (let i = streamState.entryNum; i < n; ++i) {
streamState.entryNum = i; streamState.entryNum = i;
streamState.streamPos = stream.pos; streamState.streamPos = stream.pos;
let type = 0, let type = 0,
offset = 0, offset = 0,
generation = 0; generation = 0;
for (j = 0; j < typeFieldWidth; ++j) { for (let j = 0; j < typeFieldWidth; ++j) {
const typeByte = stream.getByte(); const typeByte = stream.getByte();
if (typeByte === -1) { if (typeByte === -1) {
throw new FormatError("Invalid XRef byteWidths 'type'."); throw new FormatError("Invalid XRef byteWidths 'type'.");
@ -333,14 +329,14 @@ class XRef {
if (typeFieldWidth === 0) { if (typeFieldWidth === 0) {
type = 1; type = 1;
} }
for (j = 0; j < offsetFieldWidth; ++j) { for (let j = 0; j < offsetFieldWidth; ++j) {
const offsetByte = stream.getByte(); const offsetByte = stream.getByte();
if (offsetByte === -1) { if (offsetByte === -1) {
throw new FormatError("Invalid XRef byteWidths 'offset'."); throw new FormatError("Invalid XRef byteWidths 'offset'.");
} }
offset = (offset << 8) | offsetByte; offset = (offset << 8) | offsetByte;
} }
for (j = 0; j < generationFieldWidth; ++j) { for (let j = 0; j < generationFieldWidth; ++j) {
const generationByte = stream.getByte(); const generationByte = stream.getByte();
if (generationByte === -1) { if (generationByte === -1) {
throw new FormatError("Invalid XRef byteWidths 'generation'."); throw new FormatError("Invalid XRef byteWidths 'generation'.");