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

[eugeni]

Author: eugeni
Date: Thu May  1 02:34:29 2008
New Revision: 26624

Log:
Only warn if both font family and it's full name are different from requested.


Modified:
   trunk/libass/ass_fontconfig.c

Modified: trunk/libass/ass_fontconfig.c
==============================================================================
--- trunk/libass/ass_fontconfig.c	(original)
+++ trunk/libass/ass_fontconfig.c	Thu May  1 02:34:29 2008
@@ -144,9 +144,12 @@ static char* _select_font(fc_instance_t*
 	if (result != FcResultMatch)
 		goto error;
 
-	if (strcasecmp((const char*)val_s, family) != 0)
-		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne,
-				(const char*)val_s, family);
+	if (strcasecmp((const char*)val_s, family) != 0) {
+		result = FcPatternGetString(rpat, FC_FULLNAME, 0, &val_s);
+		if (result != FcResultMatch || strcasecmp((const char*)val_s, family) != 0)
+			mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne,
+			       (const char*)val_s, family);
+	}
 
 	result = FcPatternGetString(rpat, FC_FILE, 0, &val_s);
 	if (result != FcResultMatch)