From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 8 Jun 2006 16:32:53 +0000 (+0000)
Subject: (init_fontconfig): do the init if
X-Git-Tag: cvs/HEAD~317
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fe2760bf2b14dd6f55c1fefa055da3c3434837b9;hp=efce7ad3ecc774be52a4a208fcebf504ddcf007a;p=lilypond.git

(init_fontconfig): do the init if
cache_file, but don't look at cache_file.
---

diff --git a/ChangeLog b/ChangeLog
index d7442542c6..aee68cfa88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-08  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+	* lily/font-config.cc (init_fontconfig): do the init if
+	cache_file, but don't look at cache_file.
+
 	* input/regression/quote-tie.ly: new file.
 
 	* lily/tie-engraver.cc (struct Head_event_tuple): add end_moment_
diff --git a/lily/font-config.cc b/lily/font-config.cc
index ad66c78708..7cea2fcfde 100644
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -30,17 +30,12 @@ init_fontconfig ()
   font_config_global = FcInitLoadConfig ();
   FcChar8 *cache_file = FcConfigGetCache (font_config_global);
 
-  if (!cache_file)
-    {
-      programming_error ("global fontconfig cache_file not found");
-      return;
-    }
-  
   /*
     This is a terrible kludge, but there is apparently no way for
     FontConfig to signal whether it needs to rescan directories.
    */ 
-  if (!is_file ((char*)cache_file))
+  if (cache_file
+      && !is_file ((char const *)cache_file))
     message (_f ("Rebuilding FontConfig cache %s, this may take a while...", cache_file));
 			
   vector<string> dirs;
@@ -64,7 +59,8 @@ init_fontconfig ()
   if (be_verbose_global)
     progress_indication ("\n");
 
-  if (!is_file ((char*)cache_file))
+  if (cache_file
+      && !is_file ((char*)cache_file))
     {
       /* inhibit future messages. */
       FILE *f = fopen ((char*)cache_file, "w");