Issue 4997/6: Use Preinit for font metrics

[lilypond.git] / lily / pango-font.cc

diff --git a/lily/pango-font.cc b/lily/pango-font.cc
index b805f34a8541eeb594f51f1aced0633f4c3dcf0e..798d258338787a6497fb180f9c0bf4ea3243eb30 100644 (file)
--- a/lily/pango-font.cc
+++ b/lily/pango-font.cc
@@ -46,14 +46,16 @@
 #if HAVE_PANGO_FT2
 #include "stencil.hh"
 
+void
+Pango_font::pre_init ()
+{
+  physical_font_tab_ = SCM_EOL;
+}
+
 Pango_font::Pango_font (PangoFT2FontMap *fontmap,
                         PangoFontDescription const *description,
                         Real output_scale)
 {
-  // This line looks stupid, but if we don't initialize physical_font_tab_ before
-  // we allocate memory in scm_c_make_hash_table, then that could trigger a garbage
-  // collection.
-  physical_font_tab_ = SCM_EOL;
   physical_font_tab_ = scm_c_make_hash_table (11);
   PangoDirection pango_dir = PANGO_DIRECTION_LTR;
   context_ = pango_context_new ();