X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffont-config.cc;h=cd21688ad7b0e8e5250c3df315aa74d7193c7c37;hb=60b8cc51f7c8f3b908c497cc444ed3d5da5cb94b;hp=8a2303d52d1f12171023fc5568b53655c81b1b39;hpb=23e1877b0d9f44451da6fcc6d3c8201978d77d15;p=lilypond.git

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 8a2303d52d..cd21688ad7 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -16,25 +16,20 @@
 #include "main.hh"
 #include "warn.hh"
 
+FcConfig *font_config_global = 0;
+
 void
 init_fontconfig ()
 {
   if (be_verbose_global)
     message (_ ("Initializing FontConfig..."));
-  
-  if (!FcInit ())
-    error (_ ("initializing FontConfig"));
 
-  FcConfig *fcc = FcConfigGetCurrent ();
+  if (!FcInit ())
+    error (_ ("initializing FontConfig failed"));
 
-  FcChar8 *cache = FcConfigGetCache (fcc);
-  if (!FcDirCacheValid (cache))
-    {
-      warning (_ ("FontConfig cache out of date. Rebuilding may take some time."));
-    }
-  
+  font_config_global = FcConfigGetCurrent ();
   Array<String> dirs;
-  struct stat statbuf; 
+  struct stat statbuf;
   String builddir = prefix_directory + "/mf/out/";
 
   if (stat (builddir.to_str0 (), &statbuf) == 0)
@@ -45,11 +40,11 @@ init_fontconfig ()
       dirs.push (prefix_directory + "/fonts/type1/");
       dirs.push (prefix_directory + "/fonts/svg/");
     }
-  
+
   for (int i = 0; i < dirs.size (); i++)
     {
       String dir = dirs[i];
-      if (!FcConfigAppFontAddDir (fcc, (FcChar8 *)dir.to_str0 ()))
+      if (!FcConfigAppFontAddDir (font_config_global, (FcChar8 *)dir.to_str0 ()))
 	error (_f ("adding font directory: %s", dir.to_str0 ()));
       else if (be_verbose_global)
 	message (_f ("adding font directory: %s", dir.to_str0 ()));
@@ -64,7 +59,6 @@ init_fontconfig ()
 void
 init_fontconfig ()
 {
-  
 }
 
 #endif