frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed a crash if no fonts are found

Browse Source
This commit is contained in:
Klaus Schmidinger 2007-11-04 11:11:34 +01:00
parent 7823790beb
commit c01249ffe5
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -744,6 +744,7 @@ Georg Hitsch <georg@hitsch.at>
Clemens Kirchgatterer <clemens@thf.ath.cx> Clemens Kirchgatterer <clemens@thf.ath.cx>
for suggesting to change source directory name for plugins from 'SRC' to 'src' for suggesting to change source directory name for plugins from 'SRC' to 'src'
for reporting a problem with user defined CFLAGS in libdtv/libvdr/Makefile for reporting a problem with user defined CFLAGS in libdtv/libvdr/Makefile
for suggesting an error log message if no fonts are found
Emil Naepflein <Emil.Naepflein@philosys.de> Emil Naepflein <Emil.Naepflein@philosys.de>
for suggesting to take an active SVDRP connection into account when doing shutdown or for suggesting to take an active SVDRP connection into account when doing shutdown or
@ -2231,3 +2232,6 @@ Yarema Aka Knedlyk <yupadmin@gmail.com>
Lauri Nurmi <lanurmi@iki.fi> Lauri Nurmi <lanurmi@iki.fi>
for adding a missing '.' to the date returned by DayDateTime() for adding a missing '.' to the date returned by DayDateTime()
Mario Ivankovits <mario@ops.co.at>
for fixing a crash if no fonts are found

2
HISTORY
View File

@ -5514,3 +5514,5 @@ Video Disk Recorder Revision History
Stefan Huelswitt). The 'newplugin' and 'i18n-to-gettext.pl' scripts have been Stefan Huelswitt). The 'newplugin' and 'i18n-to-gettext.pl' scripts have been
changed accordingly. Plugin authors may want to adjust the 'i18n' target changed accordingly. Plugin authors may want to adjust the 'i18n' target
of their Makefiles. of their Makefiles.
- Fixed a crash if no fonts are found (thanks to Mario Ivankovits and Clemens
Kirchgatterer).

26
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.21 2007/06/23 11:25:42 kls Exp $ * $Id: font.c 1.22 2007/11/04 11:08:12 kls Exp $
*/ */
#include "font.h" #include "font.h"
@ -395,17 +395,21 @@ cString cFont::GetFontFileName(const char *FontName)
FcConfigSubstitute(NULL, pat, FcMatchPattern); FcConfigSubstitute(NULL, pat, FcMatchPattern);
FcDefaultSubstitute(pat); FcDefaultSubstitute(pat);
FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL); FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL);
for (int i = 0; i < fontset->nfont; i++) { if (fontset) {
FcBool scalable; for (int i = 0; i < fontset->nfont; i++) {
FcPatternGetBool(fontset->fonts[i], FC_SCALABLE, 0, &scalable); FcBool scalable;
if (scalable) { FcPatternGetBool(fontset->fonts[i], FC_SCALABLE, 0, &scalable);
FcChar8 *s = NULL; if (scalable) {
FcPatternGetString(fontset->fonts[i], FC_FILE, 0, &s); FcChar8 *s = NULL;
FontFileName = (char *)s; FcPatternGetString(fontset->fonts[i], FC_FILE, 0, &s);
break; FontFileName = (char *)s;
break;
}
} }
} FcFontSetDestroy(fontset);
FcFontSetDestroy(fontset); }
else
esyslog("ERROR: no usable font found for '%s'", FontName);
FcPatternDestroy(pat); FcPatternDestroy(pat);
free(fn); free(fn);
FcFini(); FcFini();