Avoid crash with fontconfig 2.3.9x (as shipped with SuSE 10.1, FcDirScan is broken)

and warn that these are beta versions and not supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20111 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-10-08 13:01:14 +00:00
parent 0f818d83ad
commit b7971e6a40
1 changed files with 5 additions and 1 deletions

View File

@ -175,8 +175,12 @@ fc_instance_t* fontconfig_init(const char* dir, const char* family, const char*
if (FcDirCacheValid((const FcChar8 *)dir) == FcFalse)
{
mp_msg(MSGT_GLOBAL, MSGL_INFO, "[ass] Updating font cache\n");
if (FcGetVersion() >= 20390 && FcGetVersion() < 20400)
mp_msg(MSGT_GLOBAL, MSGL_WARN,
"[ass] beta versions of fontconfig are not supported\n"
" update before reporting any bugs\n");
// FontConfig >= 2.4.0 updates cache automatically in FcConfigAppFontAddDir()
if (FcGetVersion() < 20400) {
if (FcGetVersion() < 20390) {
FcFontSet* fcs;
FcStrSet* fss;
fcs = FcFontSetCreate();