From 7e4141861588187da118ec5b8671de1cea87e6c6 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 3 May 2008 10:00:10 +0200 Subject: No longer calling FcFini() to avoid problems with older (broken) versions of fontconfig --- CONTRIBUTORS | 4 ++++ HISTORY | 4 +++- font.c | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 56c38c55..7b703b39 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2352,3 +2352,7 @@ Adrian Caval Nan Feng for translating OSD texts to the Chinese language + +Edgar Toernig + for suggesting to not call FcFini() to avoid problems with older (broken) versions + of fontconfig diff --git a/HISTORY b/HISTORY index 58e415a7..afa0c587 100644 --- a/HISTORY +++ b/HISTORY @@ -5741,10 +5741,12 @@ Video Disk Recorder Revision History - Increased the time between checking the CAM status to 500ms to avoid problems with some CAMs (reported by Arthur Konovalov). -2008-05-02: Version 1.6.0-2 +2008-05-03: Version 1.6.0-2 - Updated the Italian OSD texts (thanks to Diego Pierotto). - The SVDRP signon message now indicates the character encoding in use, as in "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). diff --git a/font.c b/font.c index b458e890..e91c78c8 100644 --- a/font.c +++ b/font.c @@ -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 1.25.1.1 2008/05/03 09:59:24 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; } -- cgit v1.2.3