From 1bbf0592eb6997cdd642a3a045039bb133615e26 Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Mon, 22 Feb 2010 22:17:40 -0800 Subject: [PATCH] Fontconfig: remove obsolete code. - Since FcConfigGetCache() always recent NULL in modern Fontconfig versions, a lot of this code is obsolete. Unfortunately, there doesn't appear to be a way for Fontconfig to rebuild the font cache *if needed*, as the code comment notes. --- lily/font-config.cc | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/lily/font-config.cc b/lily/font-config.cc index cffe4d9d69..b66dc1f40b 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -39,21 +39,8 @@ init_fontconfig () if (be_verbose_global) message (_ ("Initializing FontConfig...")); + /* TODO: Find a way for Fontconfig to update its cache, if needed. */ font_config_global = FcInitLoadConfig (); - FcChar8 *cache_file = FcConfigGetCache (font_config_global); - -#if 0 - // always returns 0 for FC 2.4 - if (!cache_file) - programming_error ("Cannot find file for FontConfig cache."); -#endif - /* - This is a terrible kludge, but there is apparently no way for - FontConfig to signal whether it needs to rescan directories. - */ - if (cache_file - && !is_file ((char const *)cache_file)) - message (_f ("Rebuilding FontConfig cache %s, this may take a while...", cache_file)); vector dirs; @@ -71,21 +58,14 @@ init_fontconfig () } if (be_verbose_global) - message (_ ("Building font database.")); + message (_ ("Building font database...")); + FcConfigBuildFonts (font_config_global); FcConfigSetCurrent (font_config_global); + if (be_verbose_global) message ("\n"); - if (cache_file - && !is_file ((char*)cache_file)) - { - /* inhibit future messages. */ - FILE *f = fopen ((char*)cache_file, "w"); - if (f) - fclose (f); - } - } #else -- 2.39.5