diff options
Diffstat (limited to 'font.c')
| -rw-r--r-- | font.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -6,7 +6,7 @@ * * BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya. * - * $Id: font.c 2.10 2012/03/02 10:47:45 kls Exp $ + * $Id: font.c 2.13 2012/06/02 13:38:28 kls Exp $ */ #include "font.h" @@ -412,7 +412,7 @@ const cFont *cFont::GetFont(eDvbFont Font) if (!fonts[Font]) { switch (Font) { case fontOsd: SetFont(Font, Setup.FontOsd, Setup.FontOsdSize); break; - case fontSml: SetFont(Font, Setup.FontSml, Setup.FontSmlSize); break; + case fontSml: SetFont(Font, Setup.FontSml, min(Setup.FontSmlSize, Setup.FontOsdSize)); break; case fontFix: SetFont(Font, Setup.FontFix, Setup.FontFixSize); break; default: esyslog("ERROR: unknown Font %d (%s %d)", Font, __FUNCTION__, __LINE__); } @@ -482,7 +482,8 @@ cString cFont::GetFontFileName(const char *FontName) FcPatternAddBool(pat, FC_SCALABLE, FcTrue); FcConfigSubstitute(NULL, pat, FcMatchPattern); FcDefaultSubstitute(pat); - FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL); + FcResult fresult; + FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, &fresult); if (fontset) { for (int i = 0; i < fontset->nfont; i++) { FcBool scalable; @@ -508,7 +509,7 @@ cString cFont::GetFontFileName(const char *FontName) #ifdef BIDI cString cFont::Bidi(const char *Ltr) { - if (cCharSetConv::SystemCharacterTable()) { // bidi requires UTF-8 + if (!cCharSetConv::SystemCharacterTable()) { // bidi requires UTF-8 fribidi_set_mirroring(true); fribidi_set_reorder_nsm(false); FriBidiCharSet fribidiCharset = FRIBIDI_CHAR_SET_UTF8; |