Mercurial > mplayer.hg
changeset 26819:d288ec15f2cc
Fix compilation with FontConfig <= 2.2.96.
It lacks FcPatternRemove function. The code will work fine, but produce an
incorrect "Selected font is not the requested one" warning in rare cases.
| author | eugeni |
|---|---|
| date | Thu, 22 May 2008 08:58:06 +0000 |
| parents | 089ac698f8b1 |
| children | 22bf71a296bc |
| files | libass/ass_fontconfig.c |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libass/ass_fontconfig.c Wed May 21 20:46:05 2008 +0000 +++ b/libass/ass_fontconfig.c Thu May 22 08:58:06 2008 +0000 @@ -150,11 +150,13 @@ if (curf >= fset->nfont) goto error; +#if (FC_VERSION >= 20297) // Remove all extra family names from original pattern. // After this, FcFontRenderPrepare will select the most relevant family // name in case there are more than one of them. for (; family_cnt > 1; --family_cnt) FcPatternRemove(pat, FC_FAMILY, family_cnt - 1); +#endif rpat = FcFontRenderPrepare(priv->config, pat, fset->fonts[curf]); if (!rpat)