frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

No longer calling FcFini() to avoid problems with older (broken) versions of fontconfig

This commit is contained in:
Klaus Schmidinger 2008-05-02 20:34:46 +02:00
parent b6eaa08dbf
commit 8ce144c607
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -2359,3 +2359,7 @@ Adrian Caval <anrxc@sysphere.org>
Nan Feng <nfgx@21cn.com> Nan Feng <nfgx@21cn.com>
for translating OSD texts to the Chinese language 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

2
HISTORY
View File

@ -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". "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 This may be useful for instance for external tools that provide EPG data, so that
they can correctly encode the strings. 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 2008-05-02: Version 1.6.0-2

6
font.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "font.h"
@ -395,7 +395,7 @@ bool cFont::GetAvailableFontNames(cStringList *FontNames, bool Monospaced)
FcFontSetDestroy(fontset); FcFontSetDestroy(fontset);
FcPatternDestroy(pat); FcPatternDestroy(pat);
FcObjectSetDestroy(os); FcObjectSetDestroy(os);
FcFini(); //FcFini(); // older versions of fontconfig are broken - and FcInit() can be called more than once
FontNames->Sort(); FontNames->Sort();
} }
return FontNames->Size() > 0; return FontNames->Size() > 0;
@ -431,7 +431,7 @@ cString cFont::GetFontFileName(const char *FontName)
esyslog("ERROR: no usable font found for '%s'", FontName); esyslog("ERROR: no usable font found for '%s'", FontName);
FcPatternDestroy(pat); FcPatternDestroy(pat);
free(fn); free(fn);
FcFini(); //FcFini(); // older versions of fontconfig are broken - and FcInit() can be called more than once
} }
return FontFileName; return FontFileName;
} }