From: eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 19 Sep 2006 13:06:44 +0000 (+0000)
Subject: Don't call FcDirScan/FcDirSave with FontConfig >= 2.4.
X-Git-Tag: 0.9.7~444
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59810606eafc189b97daf80829a44e7b882b81c4;p=libass

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
---

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);