X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-select.cc;h=a5957ba715dab54ce231423ab6a356c88187cc94;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=a633e685f2d37fb2626b1310264cb724ddcc482a;hpb=d61cf3bbdb1c6670a127ba3baddf2f04d3e34fd3;p=lilypond.git diff --git a/lily/font-select.cc b/lily/font-select.cc index a633e685f2..a5957ba715 100644 --- a/lily/font-select.cc +++ b/lily/font-select.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2003--2012 Han-Wen Nienhuys + Copyright (C) 2003--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -42,7 +42,7 @@ get_font_by_design_size (Output_def *layout, Real requested, if (scm_promise_p (entry) == SCM_BOOL_T) { - Font_metric *fm = unsmob_metrics (scm_force (entry)); + Font_metric *fm = Font_metric::unsmob (scm_force (entry)); size = fm->design_size (); } #if HAVE_PANGO_FT2 @@ -86,7 +86,7 @@ get_font_by_design_size (Output_def *layout, Real requested, #endif } else - fm = unsmob_metrics (scm_force (scm_c_vector_ref (font_vector, i))); + fm = Font_metric::unsmob (scm_force (scm_c_vector_ref (font_vector, i))); return find_scaled_font (layout, fm, requested / size); }