(init_fontconfig): add warning if cache_file

is null.

diff --git a/ChangeLog b/ChangeLog
index 8a4830e8f47e5021508d99f6817d45d1fb6ca4fe..00ff0a3a54eef39a8dca0d685352d8fa1926b132 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-13  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * lily/font-config.cc (init_fontconfig): add warning if cache_file
+       is null.
+
        * buildscripts/output-distance.py (test_compare_signatures):
        timing routines.
        (read_signature_file): use new signature format.

diff --git a/THANKS b/THANKS
index 94123130a92f91cd33534a898d1142846c61f250..4ab7e009d7648fd751c6361634129c98516a46b2 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -10,22 +10,22 @@ Mats Bengtsson    - Support Guru
 
 CONTRIBUTORS
 
-Erlend Aasland
 David Feuer
+Erik Sandberg
+Erlend Aasland
 Heikki Junes
 Joe Neeman
-Erik Sandberg
 
 
 SPONSORS
 
-Trevor Bača
 Andrew Sidwell
 Chris Sawer
 Jamie Bullock
 Michael Meixner 
 Steve Doonan
 Trent Johnston
+Trevor Bača
 Vivian Barty-Taylor
 
 
@@ -45,14 +45,14 @@ Albert Frantz
 Aurèle Duda
 Bernie Arai
 Cameron Horsburgh
-Claude Routhier
-Christopher Ellis
 Christian Hitz
+Christopher Ellis
+Claude Routhier
 Colin Wilding
 David Rogers
 Francisco Vila
-J. Leung
 Harald Wellmann
+J. Leung
 Karl Hammar
 Keith Packard
 Mark Dewey

diff --git a/lily/font-config.cc b/lily/font-config.cc
index 7cea2fcfdee321295085ff37b64a572512fa05a9..0993f8183722a982a11cb72c2542c530a5365ef3 100644 (file)
--- a/lily/font-config.cc
+++ b/lily/font-config.cc
@@ -30,6 +30,9 @@ init_fontconfig ()
   font_config_global = FcInitLoadConfig ();
   FcChar8 *cache_file = FcConfigGetCache (font_config_global);
 
+  if (!cache_file)
+    programming_error ("Cannot find file for FontConfig cache.");
+
   /*
     This is a terrible kludge, but there is apparently no way for
     FontConfig to signal whether it needs to rescan directories.