[MPlayer-cvslog] r34910 - trunk/sub/font_load_ft.c

reimar subversion at mplayerhq.hu
Wed May 16 23:30:06 CEST 2012


Author: reimar
Date: Wed May 16 23:30:06 2012
New Revision: 34910

Log:
Add result argument to second FcFontMatch argument, just like for the first.

Fixes a possible assertion in fontconfig.

Modified:
   trunk/sub/font_load_ft.c

Modified: trunk/sub/font_load_ft.c
==============================================================================
--- trunk/sub/font_load_ft.c	Wed May 16 16:27:57 2012	(r34909)
+++ trunk/sub/font_load_ft.c	Wed May 16 23:30:06 2012	(r34910)
@@ -1159,7 +1159,7 @@ void load_font_ft(int width, int height,
                 FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
                 FcDefaultSubstitute(fc_pattern);
                 fc_pattern2 = fc_pattern;
-                fc_pattern = FcFontMatch(0, fc_pattern, 0);
+                fc_pattern = FcFontMatch(0, fc_pattern, &result);
                 FcPatternDestroy(fc_pattern2);
             }
             // s doesn't need to be freed according to fontconfig docs


More information about the MPlayer-cvslog mailing list