Reducing fonttools memory usage by 10MiB by passing lazy=True to TTFo…

…nt constructor
py-pdf · Mar 10, 2023 · efb668a · efb668a
1 parent f8de21c
commit efb668a
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 23 deletions.
diff --git a/fpdf/fpdf.py b/fpdf/fpdf.py
@@ -1798,7 +1798,7 @@ def add_font(self, family=None, style="", fname=None, uni="DEPRECATED"):
         if fontkey in self.fonts or fontkey in self.core_fonts:
             warnings.warn(f"Core font or font already added '{fontkey}': doing nothing")
             return
-        font = ttLib.TTFont(font_file_path, fontNumber=0)
+        font = ttLib.TTFont(font_file_path, fontNumber=0, lazy=True)
 
         scale = 1000 / font["head"].unitsPerEm
         default_width = round(scale * font["hmtx"].metrics[".notdef"][0])

diff --git a/fpdf/output.py b/fpdf/output.py
@@ -578,7 +578,7 @@ def _add_fonts(self):
                 # recalcTimestamp=False means that it doesn't modify the "modified" timestamp in head table
                 # if we leave recalcTimestamp=True the tests will break every time
                 fonttools_font = ttLib.TTFont(
-                    file=font["ttffile"], recalcTimestamp=False, fontNumber=0
+                    file=font["ttffile"], recalcTimestamp=False, fontNumber=0, lazy=True
                 )
 
                 # 1. get all glyphs in PDF

diff --git a/test/end_to_end_legacy/__init__.py b/test/end_to_end_legacy/__init__.py
diff --git a/test/end_to_end_legacy/charmap/__init__.py b/test/end_to_end_legacy/charmap/__init__.py
diff --git a/...ap/charmap_first_999_chars-DejaVuSans.pdf → ...ts/charmap_first_999_chars-DejaVuSans.pdf b/...ap/charmap_first_999_chars-DejaVuSans.pdf → ...ts/charmap_first_999_chars-DejaVuSans.pdf
diff --git a/...map_first_999_chars-DroidSansFallback.pdf → ...map_first_999_chars-DroidSansFallback.pdf b/...map_first_999_chars-DroidSansFallback.pdf → ...map_first_999_chars-DroidSansFallback.pdf
diff --git a/test/fonts/charmap_first_999_chars-NotoSans.pdf b/test/fonts/charmap_first_999_chars-NotoSans.pdf
diff --git a/test/fonts/charmap_first_999_chars-NotoSansSymbols.pdf b/test/fonts/charmap_first_999_chars-NotoSansSymbols.pdf
diff --git a/test/fonts/charmap_first_999_chars-NotoSerif.pdf b/test/fonts/charmap_first_999_chars-NotoSerif.pdf
diff --git a/test/fonts/charmap_first_999_chars-Quicksand-Regular.pdf b/test/fonts/charmap_first_999_chars-Quicksand-Regular.pdf
diff --git a/...harmap_first_999_chars-Roboto-Regular.pdf → ...harmap_first_999_chars-Roboto-Regular.pdf b/...harmap_first_999_chars-Roboto-Regular.pdf → ...harmap_first_999_chars-Roboto-Regular.pdf
diff --git a/test/fonts/charmap_first_999_chars-Waree.pdf b/test/fonts/charmap_first_999_chars-Waree.pdf
diff --git a/...harmap/charmap_first_999_chars-cmss12.pdf → .../fonts/charmap_first_999_chars-cmss12.pdf b/...harmap/charmap_first_999_chars-cmss12.pdf → .../fonts/charmap_first_999_chars-cmss12.pdf
diff --git a/...end_to_end_legacy/charmap/test_charmap.py → test/fonts/test_charmap.py b/...end_to_end_legacy/charmap/test_charmap.py → test/fonts/test_charmap.py
@@ -11,36 +11,45 @@
 """
 from pathlib import Path
 
+from fontTools.ttLib import TTFont
 import pytest
 
-import fpdf
-from fontTools import ttLib
+from fpdf import FPDF
 from test.conftest import assert_pdf_equal
 
 HERE = Path(__file__).resolve().parent
 
 
 @pytest.mark.parametrize(
     "font_filename",
-    ["DejaVuSans.ttf", "DroidSansFallback.ttf", "Roboto-Regular.ttf", "cmss12.ttf"],
+    [
+        font_file.name
+        for font_file in HERE.glob("*.*tf")
+        if not any(
+            exclude in font_file.stem
+            for exclude in ("Bold", "Italic", "NotoColorEmoji")
+        )
+    ],
 )
-def test_first_999_chars(font_filename, tmp_path):
-    font_path = HERE / ".." / ".." / "fonts" / font_filename
+def test_charmap_first_999_chars(font_filename, tmp_path):
+    """
+    Character Map Test
+    from PyFPDF version 1.7.2: github.com/reingart/pyfpdf/commit/2eab310cfd866ce24947c3a9d850ebda7c6d515d
+    """
+    font_path = HERE / font_filename
     font_name = font_path.stem
 
-    pdf = fpdf.FPDF()
+    pdf = FPDF()
     pdf.add_page()
-    pdf.add_font(font_name, fname=font_path)
+    pdf.add_font(fname=font_path)
     pdf.set_font(font_name, size=10)
 
-    font = ttLib.TTFont(font_path)
+    font = TTFont(font_path, lazy=True)
     cmap = font.getBestCmap()
 
-    # Create a PDF with the first 999 charters defined in the font:
-    for counter, character in enumerate(cmap, 0):
+    # Create a PDF with the first 999 characters defined in the font:
+    for counter, character in enumerate(list(cmap.keys())[:1000]):
         pdf.write(8, f"{counter:03}) {character:03x} - {character:c}", print_sh=True)
         pdf.ln()
-        if counter >= 999:
-            break
 
     assert_pdf_equal(pdf, HERE / f"charmap_first_999_chars-{font_name}.pdf", tmp_path)
diff --git a/test/test_perfs.py b/test/test_perfs.py
@@ -1,15 +1,17 @@
 from pathlib import Path
 
-import memunit, pytest
+import pytest
 
 from fpdf import FPDF
 
 HERE = Path(__file__).resolve().parent
 
 
 @pytest.mark.timeout(40)
-# ensure memory usage does not get too high - this value depends on Python version:
-@memunit.assert_lt_mb(185)
+# Note: this does not combine well with memunit.
+# memory_profiler.MemTimer does not terminate properly when a signal is raised by pytest-timeout,
+# and as a consequence multiprocessing.util._exit_function becomes blocking at the end of Pytest execution,
+# (on line "calling join() for process MemTimer-1")
 def test_intense_image_rendering():
     png_file_paths = []
     for png_file_path in (HERE / "image/png_images/").glob("*.png"):