[MPlayer-cvslog] r20111 - trunk/libass/ass_fontconfig.c

[reimar]

Author: reimar
Date: Sun Oct  8 15:01:14 2006
New Revision: 20111

Modified:
   trunk/libass/ass_fontconfig.c

Log:
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.


Modified: trunk/libass/ass_fontconfig.c
==============================================================================
--- trunk/libass/ass_fontconfig.c	(original)
+++ trunk/libass/ass_fontconfig.c	Sun Oct  8 15:01:14 2006
@@ -175,8 +175,12 @@
 	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();