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

eugeni subversion at mplayerhq.hu
Thu May 8 15:53:58 CEST 2008


Author: eugeni
Date: Thu May  8 15:53:58 2008
New Revision: 26691

Log:
If both full name and family are available, use the former in inexact match warning.


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  8 15:53:58 2008
@@ -167,7 +167,7 @@ static char* _select_font(fc_instance_t*
 	if (!(r_family && strcasecmp((const char*)r_family, family) == 0) &&
 	    !(r_fullname && strcasecmp((const char*)r_fullname, family) == 0))
 		mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_SelectedFontFamilyIsNotTheRequestedOne,
-		       (const char*)(r_family ? r_family : r_fullname), family);
+		       (const char*)(r_fullname ? r_fullname : r_family), family);
 
 	result = FcPatternGetString(rpat, FC_STYLE, 0, &r_style);
 	if (result != FcResultMatch)



More information about the MPlayer-cvslog mailing list