Mercurial > mplayer.hg

comparison sub/font_load_ft.c @ 34822:93f079e4e579

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add result argument to second FcFontMatch argument, just like for the first. Fixes a possible assertion in fontconfig.
author reimar
date Wed, 16 May 2012 21:30:06 +0000
parents 57d944b1a732
children 2960cd0eef6f
comparison
equal deleted inserted replaced
34821:747608fd4dcc 34822:93f079e4e579
1157 FcPatternDestroy(fc_pattern); 1157 FcPatternDestroy(fc_pattern);
1158 fc_pattern = FcNameParse("sans-serif"); 1158 fc_pattern = FcNameParse("sans-serif");
1159 FcConfigSubstitute(0, fc_pattern, FcMatchPattern); 1159 FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
1160 FcDefaultSubstitute(fc_pattern); 1160 FcDefaultSubstitute(fc_pattern);
1161 fc_pattern2 = fc_pattern; 1161 fc_pattern2 = fc_pattern;
1162 fc_pattern = FcFontMatch(0, fc_pattern, 0); 1162 fc_pattern = FcFontMatch(0, fc_pattern, &result);
1163 FcPatternDestroy(fc_pattern2); 1163 FcPatternDestroy(fc_pattern2);
1164 } 1164 }
1165 // s doesn't need to be freed according to fontconfig docs 1165 // s doesn't need to be freed according to fontconfig docs
1166 FcPatternGetString(fc_pattern, FC_FILE, 0, &s); 1166 FcPatternGetString(fc_pattern, FC_FILE, 0, &s);
1167 FcPatternGetInteger(fc_pattern, FC_INDEX, 0, &face_index); 1167 FcPatternGetInteger(fc_pattern, FC_INDEX, 0, &face_index);