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);
}
SCM
-All_font_metrics::mark_smob ()
+All_font_metrics::mark_smob () const
{
#if HAVE_PANGO_FT2
if (pango_dict_)
scm_from_double (1.0));
}
g_free (pango_fn);
- return derived_unsmob<Pango_font> (val);
+ return unsmob<Pango_font> (val);
}
#endif
debug_output ("]", false);
- Font_metric::unsmob (val)->file_name_ = file_name;
+ unsmob<Font_metric> (val)->file_name_ = file_name;
SCM name_string = ly_string2scm (name);
- Font_metric::unsmob (val)->description_ = scm_cons (name_string,
+ unsmob<Font_metric> (val)->description_ = scm_cons (name_string,
scm_from_double (1.0));
otf_dict_->set (sname, val);
- Font_metric::unsmob (val)->unprotect ();
+ unsmob<Font_metric> (val)->unprotect ();
}
- return derived_unsmob<Open_type_font> (val);
+ return unsmob<Open_type_font> (val);
}
Font_metric *