From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 13 Jun 2006 16:38:55 +0000 (+0000)
Subject: (init_fontconfig): add warning if cache_file
X-Git-Tag: release/2.10.0-2~518
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=aa2340a43e7aec14ad1281caca4225174d4357e4;p=lilypond.git

(init_fontconfig): add warning if cache_file
is null.
---

diff --git a/ChangeLog b/ChangeLog
index 8a4830e8f4..00ff0a3a54 100644
--- 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 94123130a9..4ab7e009d7 100644
--- 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 7cea2fcfde..0993f81837 100644
--- 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.