pdfkit 0.17.0 → 0.17.1

package/js/pdfkit.js

@@ -221,8 +221,18 @@ class PDFReference extends PDFAbstractReference {
   }
 }
 
+const fArray = new Float32Array(1);
+const uArray = new Uint32Array(fArray.buffer);
 function PDFNumber(n) {
-  return Math.fround(n);
+  const rounded = Math.fround(n);
+  if (rounded <= n) return rounded;
+  fArray[0] = n;
+  if (n <= 0) {
+    uArray[0] += 1;
+  } else {
+    uArray[0] -= 1;
+  }
+  return fArray[0];
 }
 function normalizeSides(sides, defaultDefinition = undefined, transformer = v => v) {
   if (sides == null || typeof sides === 'object' && Object.keys(sides).length === 0) {
@@ -2137,20 +2147,12 @@ oslash        ugrave         uacute         ucircumflex
 udieresis     yacute         thorn          ydieresis\
 `.split(/\s+/);
 class AFMFont {
-  static open(filename) {
-    return new AFMFont(fs.readFileSync(filename, 'utf8'));
-  }
   constructor(contents) {
-    this.contents = contents;
     this.attributes = {};
     this.glyphWidths = {};
     this.boundingBoxes = {};
     this.kernPairs = {};
-    this.parse();
-    this.charWidths = new Array(256);
-    for (let char = 0; char <= 255; char++) {
-      this.charWidths[char] = this.glyphWidths[characters[char]];
-    }
+    this.parse(contents);
     this.bbox = this.attributes['FontBBox'].split(/\s+/).map(e => +e);
     this.ascender = +(this.attributes['Ascender'] || 0);
     this.descender = +(this.attributes['Descender'] || 0);
@@ -2158,9 +2160,9 @@ class AFMFont {
     this.capHeight = +(this.attributes['CapHeight'] || 0);
     this.lineGap = this.bbox[3] - this.bbox[1] - (this.ascender - this.descender);
   }
-  parse() {
+  parse(contents) {
     let section = '';
-    for (let line of this.contents.split('\n')) {
+    for (let line of contents.split('\n')) {
       var match;
       var a;
       if (match = line.match(/^Start(\w+)/)) {
@@ -2813,7 +2815,7 @@ class LineWrapper extends events.EventEmitter {
     });
   }
   wordWidth(word) {
-    return this.document.widthOfString(word, this) + this.characterSpacing + this.wordSpacing;
+    return PDFNumber(this.document.widthOfString(word, this) + this.characterSpacing + this.wordSpacing);
   }
   canFit(word, w) {
     if (word[word.length - 1] != SOFT_HYPHEN) {
@@ -3731,8 +3733,8 @@ class PDFImage {
     } else if (src instanceof ArrayBuffer) {
       data = Buffer.from(new Uint8Array(src));
     } else {
-      let match;
-      if (match = /^data:.+?;base64,(.*)$/.exec(src)) {
+      const match = /^data:.+?;base64,(.*)$/.exec(src);
+      if (match) {
         data = Buffer.from(match[1], 'base64');
       } else {
         data = fs.readFileSync(src);
@@ -4819,8 +4821,8 @@ var AttachmentsMixin = {
     } else if (src instanceof ArrayBuffer) {
       data = Buffer.from(new Uint8Array(src));
     } else {
-      let match;
-      if (match = /^data:(.*?);base64,(.*)$/.exec(src)) {
+      const match = /^data:(.*?);base64,(.*)$/.exec(src);
+      if (match) {
         if (match[1]) {
           refBody.Subtype = match[1].replace('/', '#2F');
         }
@@ -5017,7 +5019,7 @@ function deepMerge(target, ...sources) {
 }
 function deepClone(obj) {
   let result = obj;
-  if (typeof obj == 'object') {
+  if (obj && typeof obj == 'object') {
     result = Array.isArray(obj) ? [] : {};
     for (const key in obj) result[key] = deepClone(obj[key]);
   }