From d49d082748078f730febc98b9dadad6c60c80c76 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 13 Jun 2006 16:38:55 +0000 Subject: [PATCH] (init_fontconfig): add warning if cache_file is null. --- ChangeLog | 3 +++ THANKS | 12 ++++++------ lily/font-config.cc | 3 +++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a4830e8f4..00ff0a3a54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-06-13 Han-Wen Nienhuys + * 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. -- 2.39.2