X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fall-font-metrics.cc;h=42b405e11bd44acd2ac74da382ea00992d406252;hb=058370efc7e9710f149d0f444328bb1fcd7bdec1;hp=25064f61b47e964d693423053e834a527488d4b6;hpb=86713eefa608f7dc738420ce0225c2a92c4539b2;p=lilypond.git diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 25064f61b4..42b405e11b 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2011 Han-Wen Nienhuys + Copyright (C) 1999--2014 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 @@ -28,7 +28,7 @@ #include "warn.hh" Index_to_charcode_map const * -All_font_metrics::get_index_to_charcode_map (string filename, +All_font_metrics::get_index_to_charcode_map (const string &filename, int face_index, FT_Face face) { @@ -40,7 +40,7 @@ All_font_metrics::get_index_to_charcode_map (string filename, return &filename_charcode_maps_map_[key]; } -All_font_metrics::All_font_metrics (string path) +All_font_metrics::All_font_metrics (const string &path) { otf_dict_ = new Scheme_hash_table; @@ -109,7 +109,7 @@ All_font_metrics::find_pango_font (PangoFontDescription const *description, #endif Open_type_font * -All_font_metrics::find_otf (string name) +All_font_metrics::find_otf (const string &name) { SCM sname = ly_symbol2scm (name.c_str ()); SCM val; @@ -140,7 +140,7 @@ All_font_metrics::find_otf (string name) } Font_metric * -All_font_metrics::find_font (string name) +All_font_metrics::find_font (const string &name) { Font_metric *f = find_otf (name);