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

Fixed font handling with fontconfig 2.9.0 or newer

This commit is contained in:
Klaus Schmidinger 2012-06-02 13:41:23 +02:00
parent 2de28295fc
commit ebf8a285b2
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -2780,6 +2780,7 @@ Dominik Strasser <dominik@die-strassers.de>
Joerg Bornkessel <hd_brummy@gentoo.org> Joerg Bornkessel <hd_brummy@gentoo.org>
for adding LDFLAGS to the linker calls in the Makefiles for adding LDFLAGS to the linker calls in the Makefiles
for fixing font handling with fontconfig 2.9.0 or newer
Andreas Oberritter <obi@opendreambox.org> Andreas Oberritter <obi@opendreambox.org>
for suggesting to retrieve the include path to the freetype2 header files for suggesting to retrieve the include path to the freetype2 header files

1
HISTORY
View File

@ -7138,3 +7138,4 @@ Video Disk Recorder Revision History
- Finally removed the code marked with __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS - Finally removed the code marked with __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS
and LEGACY_CRECEIVER. and LEGACY_CRECEIVER.
- Now making sure that the "small font" is never larger than the "osd font". - Now making sure that the "small font" is never larger than the "osd font".
- Fixed font handling with fontconfig 2.9.0 or newer (thanks to Joerg Bornkessel).

5
font.c
View File

@ -6,7 +6,7 @@
* *
* BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya. * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
* *
* $Id: font.c 2.12 2012/06/02 13:32:19 kls Exp $ * $Id: font.c 2.13 2012/06/02 13:38:28 kls Exp $
*/ */
#include "font.h" #include "font.h"
@ -482,7 +482,8 @@ cString cFont::GetFontFileName(const char *FontName)
FcPatternAddBool(pat, FC_SCALABLE, FcTrue); FcPatternAddBool(pat, FC_SCALABLE, FcTrue);
FcConfigSubstitute(NULL, pat, FcMatchPattern); FcConfigSubstitute(NULL, pat, FcMatchPattern);
FcDefaultSubstitute(pat); FcDefaultSubstitute(pat);
FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL); FcResult fresult;
FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, &fresult);
if (fontset) { if (fontset) {
for (int i = 0; i < fontset->nfont; i++) { for (int i = 0; i < fontset->nfont; i++) {
FcBool scalable; FcBool scalable;