diff options
author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-09-19 13:06:44 +0000 |
---|---|---|
committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-09-19 13:06:44 +0000 |
commit | 59810606eafc189b97daf80829a44e7b882b81c4 (patch) | |
tree | 9ede005dc8ca9ace3e5dda99f9659bccd10db01a /libass/ass_fontconfig.c | |
parent | 4201c79997245bac42667c85251a5110e974c4f0 (diff) | |
download | libass-59810606eafc189b97daf80829a44e7b882b81c4.tar.bz2 libass-59810606eafc189b97daf80829a44e7b882b81c4.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/ass_fontconfig.c')
-rw-r--r-- | libass/ass_fontconfig.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index 3c1ea61..53dfd17 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); |