summaryrefslogtreecommitdiffstats
path: root/libass
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-09-19 13:06:44 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-09-19 13:06:44 +0000
commit61d45a940d518479fa8bf7fceaf641a04e4a0731 (patch)
tree6f410a446eaa56c3a8a39de931571fa8c8df1cdf /libass
parenta9a72d676afd0b2e1ba76586d5c41b22a91305a9 (diff)
downloadmpv-61d45a940d518479fa8bf7fceaf641a04e4a0731.tar.bz2
mpv-61d45a940d518479fa8bf7fceaf641a04e4a0731.tar.xz
Don't call FcDirScan/FcDirSave with FontConfig >= 2.4.
Font cache is updated automatically in FcConfigAppFontAddDir. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19907 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
-rw-r--r--libass/ass_fontconfig.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c
index 3c1ea61148..53dfd17335 100644
--- a/libass/ass_fontconfig.c
+++ b/libass/ass_fontconfig.c
@@ -154,9 +154,11 @@ 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");
+ // FontConfig >= 2.4.0 updates cache automatically in FcConfigAppFontAddDir()
+ if (FcGetVersion() < 20400) {
FcFontSet* fcs;
FcStrSet* fss;
- mp_msg(MSGT_GLOBAL, MSGL_INFO, "[ass] Updating font cache\n");
fcs = FcFontSetCreate();
fss = FcStrSetCreate();
rc = FcStrSetAdd(fss, (const FcChar8*)dir);
@@ -178,6 +180,7 @@ fc_instance_t* fontconfig_init(const char* dir, const char* family, const char*
}
ErrorFontCache:
;
+ }
}
rc = FcConfigAppFontAddDir(priv->config, (const FcChar8*)dir);