diff options
| -rw-r--r-- | CONTRIBUTORS | 4 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | font.c | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 01ff15e2..821e286c 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2359,3 +2359,7 @@ Adrian Caval <anrxc@sysphere.org> Nan Feng <nfgx@21cn.com> for translating OSD texts to the Chinese language + +Edgar Toernig <froese@gmx.de> + for suggesting to not call FcFini() to avoid problems with older (broken) versions + of fontconfig @@ -5779,6 +5779,8 @@ Video Disk Recorder Revision History "220 video SVDRP VideoDiskRecorder 1.7.1; Fri May 2 16:17:10 2008; ISO-8859-1". This may be useful for instance for external tools that provide EPG data, so that they can correctly encode the strings. +- No longer calling FcFini() to avoid problems with older (broken) versions of + fontconfig (suggested by Edgar Toernig). 2008-05-02: Version 1.6.0-2 @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: font.c 1.25 2008/03/01 10:19:41 kls Exp $ + * $Id: font.c 2.1 2008/05/02 16:16:51 kls Exp $ */ #include "font.h" @@ -395,7 +395,7 @@ bool cFont::GetAvailableFontNames(cStringList *FontNames, bool Monospaced) FcFontSetDestroy(fontset); FcPatternDestroy(pat); FcObjectSetDestroy(os); - FcFini(); + //FcFini(); // older versions of fontconfig are broken - and FcInit() can be called more than once FontNames->Sort(); } return FontNames->Size() > 0; @@ -431,7 +431,7 @@ cString cFont::GetFontFileName(const char *FontName) esyslog("ERROR: no usable font found for '%s'", FontName); FcPatternDestroy(pat); free(fn); - FcFini(); + //FcFini(); // older versions of fontconfig are broken - and FcInit() can be called more than once } return FontFileName; } |