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

Move font family check to the end of the list. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26646 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2008-05-02 23:32:26 +00:00
parent 97972596e8
commit 9a20a76b06
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libass/ass_fontconfig.c
View File

@ -140,6 +140,11 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold
goto error; goto error;
*index = r_index; *index = r_index;
result = FcPatternGetString(rpat, FC_FILE, 0, &r_file);
if (result != FcResultMatch)
goto error;
retval = strdup((const char*)r_file);
result = FcPatternGetString(rpat, FC_FAMILY, 0, &r_family); result = FcPatternGetString(rpat, FC_FAMILY, 0, &r_family);
if (result != FcResultMatch) if (result != FcResultMatch)
goto error; goto error;
@ -151,11 +156,6 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold
(const char*)r_family, family); (const char*)r_family, family);
} }
result = FcPatternGetString(rpat, FC_FILE, 0, &r_file);
if (result != FcResultMatch)
goto error;
retval = strdup((const char*)r_file);
error: error:
if (pat) FcPatternDestroy(pat); if (pat) FcPatternDestroy(pat);
if (fset) FcFontSetDestroy(fset); if (fset) FcFontSetDestroy(fset);