Merge pull request #21079 from Snuffleupagus/CFFParser-DataView

Re-factor the `CFFParser` class to use `DataView`s when reading data

src/core/annotation.js

@@ -2546,6 +2546,7 @@ class WidgetAnnotation extends Annotation {
         defaultVPadding,
         descent,
         lineHeight,
+        alignment,
         annotationStorage
       );
     }
@@ -2909,6 +2910,7 @@ class TextWidgetAnnotation extends WidgetAnnotation {
     vPadding,
     descent,
     lineHeight,
+    alignment,
     annotationStorage
   ) {
     const combWidth = width / this.data.maxLen;
@@ -2921,11 +2923,19 @@ class TextWidgetAnnotation extends WidgetAnnotation {
       buf.push(`(${escapeString(text.substring(start, end))}) Tj`);
     }
 
+    const textWidth = combWidth * positions.length;
+    let hShift = hPadding;
+    if (alignment === 1) {
+      hShift += Math.floor((width - textWidth) / (2 * combWidth)) * combWidth;
+    } else if (alignment === 2) {
+      hShift += width - textWidth;
+    }
+
     const renderedComb = buf.join(` ${numberToString(combWidth)} 0 Td `);
     return (
       `/Tx BMC q ${colors}BT ` +
       defaultAppearance +
-      ` 1 0 0 1 ${numberToString(hPadding)} ${numberToString(
+      ` 1 0 0 1 ${numberToString(hShift)} ${numberToString(
         vPadding + descent
       )} Tm ${renderedComb}` +
       " ET Q EMC"

src/core/cff_parser.js

@@ -28,7 +28,6 @@ import {
   ISOAdobeCharset,
 } from "./charsets.js";
 import { ExpertEncoding, StandardEncoding } from "./encodings.js";
-import { readInt16 } from "./core_utils.js";
 
 // Maximum subroutine call depth of type 2 charstrings. Matches OTS.
 const MAX_SUBR_NESTING = 10;
@@ -355,6 +354,7 @@ class CFFParser {
   }
 
   parseDict(dict) {
+    const view = new DataView(dict.buffer, dict.byteOffset, dict.bytesLength);
     let pos = 0;
 
     function parseOperand() {
@@ -362,14 +362,12 @@ class CFFParser {
       if (value === 30) {
         return parseFloatOperand();
       } else if (value === 28) {
-        value = readInt16(dict, pos);
+        value = view.getInt16(pos);
         pos += 2;
         return value;
       } else if (value === 29) {
-        value = dict[pos++];
+        value = view.getInt32(pos);
-        value = (value << 8) | dict[pos++];
+        pos += 4;
-        value = (value << 8) | dict[pos++];
-        value = (value << 8) | dict[pos++];
         return value;
       } else if (value >= 32 && value <= 246) {
         return value - 139;
@@ -378,7 +376,7 @@ class CFFParser {
       } else if (value >= 251 && value <= 254) {
         return -((value - 251) * 256) - dict[pos++] - 108;
       }
-      warn('CFFParser_parseDict: "' + value + '" is a reserved command.');
+      warn(`CFFParser.parseDict: "${value}" is a reserved command.`);
       return NaN;
     }
 
@@ -489,6 +487,7 @@ class CFFParser {
     if (!data || state.callDepth > MAX_SUBR_NESTING) {
       return false;
     }
+    const view = new DataView(data.buffer, data.byteOffset, data.bytesLength);
     let stackSize = state.stackSize;
     const stack = state.stack;
 
@@ -513,7 +512,7 @@ class CFFParser {
         }
       } else if (value === 28) {
         // number (16 bit)
-        stack[stackSize] = readInt16(data, j);
+        stack[stackSize] = view.getInt16(j);
         j += 2;
         stackSize++;
       } else if (value === 14) {
@@ -539,12 +538,7 @@ class CFFParser {
         stackSize++;
       } else if (value === 255) {
         // number (32 bit)
-        stack[stackSize] =
+        stack[stackSize] = view.getInt32(j) / 65536;
-          ((data[j] << 24) |
-            (data[j + 1] << 16) |
-            (data[j + 2] << 8) |
-            data[j + 3]) /
-          65536;
         j += 4;
         stackSize++;
       } else if (value === 19 || value === 20) {

src/core/opentype_file_builder.js

@@ -13,38 +13,16 @@
  * limitations under the License.
  */
 
-import { readUint32 } from "./core_utils.js";
+import { stringToBytes } from "../shared/util.js";
-import { string32 } from "../shared/util.js";
-
-function writeInt16(dest, offset, num) {
-  dest[offset] = (num >> 8) & 0xff;
-  dest[offset + 1] = num & 0xff;
-}
-
-function writeInt32(dest, offset, num) {
-  dest[offset] = (num >> 24) & 0xff;
-  dest[offset + 1] = (num >> 16) & 0xff;
-  dest[offset + 2] = (num >> 8) & 0xff;
-  dest[offset + 3] = num & 0xff;
-}
-
-function writeData(dest, offset, data) {
-  if (data instanceof Uint8Array) {
-    dest.set(data, offset);
-  } else if (typeof data === "string") {
-    for (let i = 0, ii = data.length; i < ii; i++) {
-      dest[offset++] = data.charCodeAt(i) & 0xff;
-    }
-  }
-}
 
 const OTF_HEADER_SIZE = 12;
 const OTF_TABLE_ENTRY_SIZE = 16;
 
 class OpenTypeFileBuilder {
+  #tables = new Map();
+
   constructor(sfnt) {
     this.sfnt = sfnt;
-    this.tables = Object.create(null);
   }
 
   static getSearchParams(entriesCount, entrySize) {
@@ -66,83 +44,86 @@ class OpenTypeFileBuilder {
     let sfnt = this.sfnt;
 
     // Tables needs to be written by ascendant alphabetic order
-    const tables = this.tables;
+    const tables = this.#tables;
-    const tablesNames = Object.keys(tables);
+    const tablesNames = [...tables.keys()].sort();
-    tablesNames.sort();
     const numTables = tablesNames.length;
 
-    let i, j, jj, table, tableName;
     // layout the tables data
     let offset = OTF_HEADER_SIZE + numTables * OTF_TABLE_ENTRY_SIZE;
     const tableOffsets = [offset];
-    for (i = 0; i < numTables; i++) {
+    for (let i = 0; i < numTables; i++) {
-      table = tables[tablesNames[i]];
+      const table = tables.get(tablesNames[i]);
       const paddedLength = ((table.length + 3) & ~3) >>> 0;
       offset += paddedLength;
       tableOffsets.push(offset);
     }
 
-    const file = new Uint8Array(offset);
+    const file = new Uint8Array(offset),
+      view = new DataView(file.buffer);
     // write the table data first (mostly for checksum)
-    for (i = 0; i < numTables; i++) {
+    for (let i = 0; i < numTables; i++) {
-      table = tables[tablesNames[i]];
+      const table = tables.get(tablesNames[i]);
-      writeData(file, tableOffsets[i], table);
+      let tableOffset = tableOffsets[i];
+
+      if (table instanceof Uint8Array) {
+        file.set(table, tableOffset);
+      } else if (typeof table === "string") {
+        for (let j = 0, jj = table.length; j < jj; j++) {
+          file[tableOffset++] = table.charCodeAt(j) & 0xff;
+        }
+      }
     }
 
     // sfnt version (4 bytes)
     if (sfnt === "true") {
       // Windows hates the Mac TrueType sfnt version number
-      sfnt = string32(0x00010000);
+      sfnt = "\x00\x01\x00\x00";
     }
-    file[0] = sfnt.charCodeAt(0) & 0xff;
+    file.set(stringToBytes(sfnt), 0);
-    file[1] = sfnt.charCodeAt(1) & 0xff;
-    file[2] = sfnt.charCodeAt(2) & 0xff;
-    file[3] = sfnt.charCodeAt(3) & 0xff;
 
     // numTables (2 bytes)
-    writeInt16(file, 4, numTables);
+    view.setInt16(4, numTables);
 
     const searchParams = OpenTypeFileBuilder.getSearchParams(numTables, 16);
 
     // searchRange (2 bytes)
-    writeInt16(file, 6, searchParams.range);
+    view.setInt16(6, searchParams.range);
     // entrySelector (2 bytes)
-    writeInt16(file, 8, searchParams.entry);
+    view.setInt16(8, searchParams.entry);
     // rangeShift (2 bytes)
-    writeInt16(file, 10, searchParams.rangeShift);
+    view.setInt16(10, searchParams.rangeShift);
 
     offset = OTF_HEADER_SIZE;
     // writing table entries
-    for (i = 0; i < numTables; i++) {
+    for (let i = 0; i < numTables; i++) {
-      tableName = tablesNames[i];
+      const tableName = tablesNames[i];
-      file[offset] = tableName.charCodeAt(0) & 0xff;
+      file.set(stringToBytes(tableName), offset);
-      file[offset + 1] = tableName.charCodeAt(1) & 0xff;
-      file[offset + 2] = tableName.charCodeAt(2) & 0xff;
-      file[offset + 3] = tableName.charCodeAt(3) & 0xff;
 
       // checksum
       let checksum = 0;
-      for (j = tableOffsets[i], jj = tableOffsets[i + 1]; j < jj; j += 4) {
+      for (let j = tableOffsets[i], jj = tableOffsets[i + 1]; j < jj; j += 4) {
-        const quad = readUint32(file, j);
+        const quad = view.getUint32(j);
         checksum = (checksum + quad) >>> 0;
       }
-      writeInt32(file, offset + 4, checksum);
+      view.setInt32(offset + 4, checksum);
 
       // offset
-      writeInt32(file, offset + 8, tableOffsets[i]);
+      view.setInt32(offset + 8, tableOffsets[i]);
       // length
-      writeInt32(file, offset + 12, tables[tableName].length);
+      view.setInt32(offset + 12, tables.get(tableName).length);
 
       offset += OTF_TABLE_ENTRY_SIZE;
     }
+
+    this.#tables.clear();
     return file;
   }
 
   addTable(tag, data) {
-    if (tag in this.tables) {
+    if (this.#tables.has(tag)) {
-      throw new Error("Table " + tag + " already exists");
+      throw new Error(`Table ${tag} already exists`);
     }
-    this.tables[tag] = data;
+    this.#tables.set(tag, data);
   }
 }
 

test/pdfs/.gitignore

@@ -898,3 +898,4 @@
 !function_based_shading.pdf
 !issue16091.pdf
 !issue7821.pdf
+!issue21068.pdf

test/test_manifest.json

@@ -14075,5 +14075,27 @@
     "md5": "7f0f390a70228fffe95835518ec266c5",
     "rounds": 1,
     "type": "eq"
+  },
+  {
+    "id": "issue21068",
+    "file": "pdfs/issue21068.pdf",
+    "md5": "69558d166186923ad9d639d91884dbd6",
+    "rounds": 1,
+    "type": "eq",
+    "print": true,
+    "annotationStorage": {
+      "27R": {
+        "value": "123"
+      },
+      "28R": {
+        "value": "123"
+      },
+      "29R": {
+        "value": "1234"
+      },
+      "30R": {
+        "value": "123"
+      }
+    }
   }
 ]