RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Properly free fontconfig patterns 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21517 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-12-06 11:28:49 +00:00
parent a4147be5f7
commit f5f7bb1ccb
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libvo/font_load_ft.c
View File

@ -1140,6 +1140,7 @@ void load_font_ft(int width, int height)
{
#ifdef HAVE_FONTCONFIG
FcPattern *fc_pattern;
FcPattern *fc_pattern2;
FcChar8 *s;
FcBool scalable;
#endif
@ -1160,18 +1161,23 @@ void load_font_ft(int width, int height)
fc_pattern = FcNameParse(font_name);
FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
FcDefaultSubstitute(fc_pattern);
fc_pattern2 = fc_pattern;
fc_pattern = FcFontMatch(0, fc_pattern, 0);
FcPatternDestroy(fc_pattern2);
FcPatternGetBool(fc_pattern, FC_SCALABLE, 0, &scalable);
if (scalable != FcTrue) {
FcPatternDestroy(fc_pattern);
fc_pattern = FcNameParse("sans-serif");
FcConfigSubstitute(0, fc_pattern, FcMatchPattern);
FcDefaultSubstitute(fc_pattern);
fc_pattern2 = fc_pattern;
fc_pattern = FcFontMatch(0, fc_pattern, 0);
FcPatternDestroy(fc_pattern2);
}
// s doesn't need to be freed according to fontconfig docs
FcPatternGetString(fc_pattern, FC_FILE, 0, &s);
vo_font=read_font_desc_ft(s, width, height);
free(fc_pattern);
FcPatternDestroy(fc_pattern);
}
else
#endif