Mercurial > mplayer.hg
comparison libass/ass_fontconfig.c @ 36363:c3aaaf17c721
Update libass to latest git version.
author | reimar |
---|---|
date | Tue, 24 Sep 2013 20:50:02 +0000 |
parents | 88eebbbbd6a0 |
children |
comparison
equal
deleted
inserted
replaced
36362:99708d402208 | 36363:c3aaaf17c721 |
---|---|
177 FcDefaultSubstitute(pat); | 177 FcDefaultSubstitute(pat); |
178 | 178 |
179 rc = FcConfigSubstitute(priv->config, pat, FcMatchPattern); | 179 rc = FcConfigSubstitute(priv->config, pat, FcMatchPattern); |
180 if (!rc) | 180 if (!rc) |
181 goto error; | 181 goto error; |
182 /* Fontconfig defaults include a language setting, which it sets based on | |
183 * some environment variables or defaults to "en". Unset this as we don't | |
184 * know the real language, and because some some attached fonts lack | |
185 * non-ascii characters included in fontconfig's list of characters | |
186 * required for English support and therefore don't match the lang=en | |
187 * criterion. | |
188 */ | |
189 FcPatternDel(pat, "lang"); | |
182 | 190 |
183 fsorted = FcFontSort(priv->config, pat, FcTrue, NULL, &result); | 191 fsorted = FcFontSort(priv->config, pat, FcTrue, NULL, &result); |
184 ffullname = match_fullname(library, priv, family, bold, italic); | 192 ffullname = match_fullname(library, priv, family, bold, italic); |
185 if (!fsorted || !ffullname) | 193 if (!fsorted || !ffullname) |
186 goto error; | 194 goto error; |