summaryrefslogtreecommitdiff
path: root/font.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2008-05-03 10:00:10 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2008-05-03 10:00:10 +0200
commit7e4141861588187da118ec5b8671de1cea87e6c6 (patch)
tree87ca3e17dc8f978eb004b5e39a609a1ce9b955ec /font.c
parent7c924aa664b5545616eab1473c93fa46c0cdef5b (diff)
downloadvdr-7e4141861588187da118ec5b8671de1cea87e6c6.tar.gz
vdr-7e4141861588187da118ec5b8671de1cea87e6c6.tar.bz2
No longer calling FcFini() to avoid problems with older (broken) versions of fontconfig
Diffstat (limited to 'font.c')
-rw-r--r--font.c6
1 files changed, 3 insertions, 3 deletions
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;
}