Don't use C++ default arguments.

diff --git a/lily/include/open-type-font.hh b/lily/include/open-type-font.hh
index 8c85ea5efcb0c2996bb55111dc92484f42520bf0..315113a27f1a66478a7ef8c8a31e1564ede0f71f 100644 (file)
--- 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 3bd52480a1e684f52215f337a9e3e04e3af4d50d..771a87561092afc643014baa78a0391d462752a3 100644 (file)
--- 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 7fcdc73de5b5ac701eff4f8702fb31e8b1092227..6713c1b08f70bd235022e1114e46350c8a3d8004 100644 (file)
--- 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 (),