Mercurial > mplayer.hg

changeset 26592:cc9b88c49d90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only warn if both font family and its full name are different from requested.
author eugeni
date Thu, 01 May 2008 00:34:29 +0000
parents 0f069e41d8d2
children b42233eb4b38
files libass/ass_fontconfig.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libass/ass_fontconfig.c	Thu May 01 00:34:26 2008 +0000
+++ b/libass/ass_fontconfig.c	Thu May 01 00:34:29 2008 +0000
@@ -144,9 +144,12 @@
 	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)