From: Werner Lemberg Date: Sun, 28 Dec 2008 23:34:19 +0000 (+0100) Subject: Don't use C++ default arguments. X-Git-Tag: release/2.12.1-1~21 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5a2370dfbd5957e86ce03b84914cc08216e29ffe;p=lilypond.git Don't use C++ default arguments. --- diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh index 8c85ea5efc..315113a27f 100644 --- a/lily/include/open-type-font.hh +++ b/lily/include/open-type-font.hh @@ -52,7 +52,7 @@ public: }; string get_otf_table (FT_Face face, string tag); -FT_Face open_ft_face (string str, FT_Long idx = 0); +FT_Face open_ft_face (string str, FT_Long idx); #endif /* OPEN_TYPE_FONT_HH */ diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc index 3bd52480a1..771a875610 100644 --- a/lily/open-type-font.cc +++ b/lily/open-type-font.cc @@ -108,7 +108,7 @@ open_ft_face (string str, FT_Long idx) SCM Open_type_font::make_otf (string str) { - FT_Face face = open_ft_face (str); + FT_Face face = open_ft_face (str, 0 /* index */); Open_type_font *otf = new Open_type_font (face); return otf->self_scm (); diff --git a/lily/pfb-scheme.cc b/lily/pfb-scheme.cc index 7fcdc73de5..6713c1b08f 100644 --- a/lily/pfb-scheme.cc +++ b/lily/pfb-scheme.cc @@ -40,7 +40,7 @@ LY_DEFINE (ly_otf_2_cff, "ly:otf->cff", if (be_verbose_global) progress_indication ("[" + file_name); - FT_Face face = open_ft_face (file_name); + FT_Face face = open_ft_face (file_name, 0 /* index */); string table = get_otf_table (face, "CFF "); SCM asscm = scm_from_locale_stringn ((char *) table.data (),