diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-14 23:52:45 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-14 23:52:45 +0200 |
| commit | ae2faad6669c313b7a5dd318baeee0bffdd47031 (patch) | |
| tree | 0b383b5dde56d54be4b144e7e23e96bd8bdd43cf /libass/ass_font.c | |
| parent | b93f4b7bba0e31d157b74685d3166f74a6c244d7 (diff) | |
| parent | 642162c07460e439d1d81cda4643dc028ed238e0 (diff) | |
| download | mpv-ae2faad6669c313b7a5dd318baeee0bffdd47031.tar.bz2 mpv-ae2faad6669c313b7a5dd318baeee0bffdd47031.tar.xz | |
Merge svn changes up to r28951
Diffstat (limited to 'libass/ass_font.c')
| -rw-r--r-- | libass/ass_font.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libass/ass_font.c b/libass/ass_font.c index f2214a345d..579e658f14 100644 --- a/libass/ass_font.c +++ b/libass/ass_font.c @@ -125,7 +125,7 @@ static int add_face(void* fc_priv, ass_font_t* font, uint32_t ch) if (font->n_faces == ASS_FONT_MAX_FACES) return -1; - path = fontconfig_select(fc_priv, font->desc.family, font->desc.bold, + path = fontconfig_select(fc_priv, font->desc.family, font->desc.treat_family_as_pattern, font->desc.bold, font->desc.italic, &index, ch); mem_idx = find_font(font->library, path); @@ -169,6 +169,7 @@ ass_font_t* ass_font_new(ass_library_t* library, FT_Library ftlibrary, void* fc_ font.ftlibrary = ftlibrary; font.n_faces = 0; font.desc.family = strdup(desc->family); + font.desc.treat_family_as_pattern = desc->treat_family_as_pattern; font.desc.bold = desc->bold; font.desc.italic = desc->italic; |