X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpango-font.cc;h=e9fb2e8fda4b4d1f20426e4cda4a74ee5f3566da;hb=2e581052026c48aed3e44fd32de74b8308f8434d;hp=0587badadb45b3c594e20a715d2d8b25dcf9f210;hpb=990120f1bbfe25fa268c623ba705a01604a300d2;p=lilypond.git diff --git a/lily/pango-font.cc b/lily/pango-font.cc index 0587badadb..e9fb2e8fda 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -180,8 +180,8 @@ Pango_font::pango_item_string_stencil (PangoGlyphItem const *glyph_item) const glyph_name[0] = '\0'; if (has_glyph_names) { - int errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, - GLYPH_NAME_LEN); + FT_Error errorcode = FT_Get_Glyph_Name (ftface, pg, glyph_name, + GLYPH_NAME_LEN); if (errorcode) programming_error ( _f ("FT_Get_Glyph_Name () error: %s", @@ -300,7 +300,7 @@ Pango_font::physical_font_tab () const extern bool music_strings_to_paths; Stencil -Pango_font::text_stencil (Output_def* state, +Pango_font::text_stencil (Output_def *state, string str, bool music_string) const { /*