Correctly compute the font size when printing a text field with an au…

…to font size (bug 1917734)
mozilla · Sep 25, 2024 · a8998fc · a8998fc
1 parent 529906c
commit a8998fc
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/src/core/annotation.js b/src/core/annotation.js
@@ -2526,12 +2526,13 @@ class WidgetAnnotation extends Annotation {
       const roundWithTwoDigits = x => Math.floor(x * 100) / 100;
 
       if (lineCount === -1) {
+        // Get the text width for a font size of 1.
         const textWidth = this._getTextWidth(text, font);
+
+        // width / textWidth is the max font size to fit the width.
+        // height / LINE_FACTOR is the max font size to fit the height.
         fontSize = roundWithTwoDigits(
-          Math.min(
-            height / LINE_FACTOR,
-            textWidth > width ? width / textWidth : Infinity
-          )
+          Math.min(height / LINE_FACTOR, width / textWidth)
         );
         numberOfLines = 1;
       } else {

diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -669,3 +669,4 @@
 !issue18693.pdf
 !bug1918115.pdf
 !bug1919513.pdf
+!bug1917734.pdf
diff --git a/test/pdfs/bug1917734.pdf b/test/pdfs/bug1917734.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -10500,5 +10500,18 @@
     "rounds": 1,
     "talos": false,
     "type": "eq"
+  },
+  {
+    "id": "bug1917734",
+    "file": "pdfs/bug1917734.pdf",
+    "md5": "1926879e5a4a87b19f740136a8f3bd8e",
+    "rounds": 1,
+    "type": "eq",
+    "print": true,
+    "annotationStorage": {
+      "24R": {
+        "value": "hello world hello world hello world hello world"
+      }
+    }
   }
 ]
diff --git a/test/unit/annotation_spec.js b/test/unit/annotation_spec.js
@@ -1850,7 +1850,7 @@ describe("annotation", function () {
       const utf16String =
         "\x30\x53\x30\x93\x30\x6b\x30\x61\x30\x6f\x4e\x16\x75\x4c\x30\x6e";
       expect(appearance).toEqual(
-        "/Tx BMC q BT /Goth 5.92 Tf 0 g 1 0 0 1 0 0 Tm" +
+        "/Tx BMC q BT /Goth 3.5 Tf 0 g 1 0 0 1 0 0 Tm" +
           ` 2 3.07 Td (${utf16String}) Tj ET Q EMC`
       );
     });