From e3246bd7dd2cb83f203dabcb43b988507ba715a7 Mon Sep 17 00:00:00 2001 From: Masamichi Hosoda Date: Fri, 12 Jun 2015 16:12:43 +0900 Subject: [PATCH] Issue 4441 / 1: Remove unnecessary loop The font dir that LilyPond adding to fontconfig is only one. So loop is unnecessary. --- lily/font-config.cc | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/lily/font-config.cc b/lily/font-config.cc index 81c0e844c8..8c84584cae 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -40,20 +40,14 @@ init_fontconfig () /* TODO: Find a way for Fontconfig to update its cache, if needed. */ font_config_global = FcInitLoadConfig (); - vector dirs; - /* Extra trailing slash suddenly breaks fontconfig (fc-cache 2.5.0) on windows. */ - dirs.push_back (lilypond_datadir + "/fonts/otf"); - - for (vsize i = 0; i < dirs.size (); i++) - { - string dir = dirs[i]; - if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ())) - error (_f ("failed adding font directory: %s", dir.c_str ())); - else - debug_output (_f ("Adding font directory: %s", dir.c_str ())); - } + string dir (lilypond_datadir + "/fonts/otf"); + + if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.c_str ())) + error (_f ("failed adding font directory: %s", dir.c_str ())); + else + debug_output (_f ("Adding font directory: %s", dir.c_str ())); debug_output (_ ("Building font database...")); -- 2.39.5