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

[eugeni]

Author: eugeni
Date: Sat May  3 01:32:26 2008
New Revision: 26646

Log:
Move font family check to the end of the list.


Modified:
   trunk/libass/ass_fontconfig.c

Modified: trunk/libass/ass_fontconfig.c
==============================================================================
--- trunk/libass/ass_fontconfig.c	(original)
+++ trunk/libass/ass_fontconfig.c	Sat May  3 01:32:26 2008
@@ -140,6 +140,11 @@ static char* _select_font(fc_instance_t*
 		goto error;
 	*index = r_index;
 
+	result = FcPatternGetString(rpat, FC_FILE, 0, &r_file);
+	if (result != FcResultMatch)
+		goto error;
+	retval = strdup((const char*)r_file);
+
 	result = FcPatternGetString(rpat, FC_FAMILY, 0, &r_family);
 	if (result != FcResultMatch)
 		goto error;
@@ -151,11 +156,6 @@ static char* _select_font(fc_instance_t*
 			       (const char*)r_family, family);
 	}
 
-	result = FcPatternGetString(rpat, FC_FILE, 0, &r_file);
-	if (result != FcResultMatch)
-		goto error;
-	
-	retval = strdup((const char*)r_file);
  error:
 	if (pat) FcPatternDestroy(pat);
 	if (fset) FcFontSetDestroy(fset);