]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/all-font-metrics.cc
Doc: CG - Compile.itexi - fix typographic error
[lilypond.git] / lily / all-font-metrics.cc
index ca3703369a98ab091a242765ec2b7c5e0a055208..a560a25940b5dbd065d50ed6ad8d81f6af6b6782 100644 (file)
@@ -27,6 +27,8 @@
 #include "scm-hash.hh"
 #include "warn.hh"
 
+const char * const All_font_metrics::type_p_name_ = 0;
+
 Index_to_charcode_map const *
 All_font_metrics::get_index_to_charcode_map (const string &filename,
                                              int face_index,
@@ -43,15 +45,15 @@ All_font_metrics::get_index_to_charcode_map (const string &filename,
 All_font_metrics::All_font_metrics (const string &path)
 {
 #if HAVE_PANGO_FT2
-  pango_dict_ = new Scheme_hash_table;
+  pango_dict_ = 0;
 #endif
 
-  otf_dict_ = new Scheme_hash_table;
+  otf_dict_ = 0;
   smobify_self ();
-  otf_dict_->unprotect ();
+  otf_dict_ = unsmob<Scheme_hash_table> (Scheme_hash_table::make_smob ());
 
 #if HAVE_PANGO_FT2
-  pango_dict_->unprotect ();
+  pango_dict_ = unsmob<Scheme_hash_table> (Scheme_hash_table::make_smob ());
   PangoFontMap *pfm = pango_ft2_font_map_new ();
 
   pango_ft2_fontmap_ = PANGO_FT2_FONT_MAP (pfm);