diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-11-06 20:41:40 +0200 |
| commit | e46ce9c0ac88cdc3b4604c249576cfde0c5c4946 (patch) | |
| tree | 6553efdc461e8d81ae2c9a7508b2dec5f116905a /libass | |
| parent | e51225dc3135e69d3f0fe6a5502c0c0e77952056 (diff) | |
| parent | 14eb21fce00bfcab5145140f22bfd706d991c101 (diff) | |
| download | mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.bz2 mpv-e46ce9c0ac88cdc3b4604c249576cfde0c5c4946.tar.xz | |
Merge svn changes up to r27899
Diffstat (limited to 'libass')
| -rw-r--r-- | libass/ass_fontconfig.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index fa15087652..9a7bddecc4 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -77,14 +77,14 @@ static char* _select_font(fc_instance_t* priv, const char* family, unsigned bold { FcBool rc; FcResult result; - FcPattern *pat = 0, *rpat = 0; + FcPattern *pat = NULL, *rpat = NULL; int r_index, r_slant, r_weight; FcChar8 *r_family, *r_style, *r_file, *r_fullname; FcBool r_outline, r_embolden; FcCharSet* r_charset; - FcFontSet* fset = 0; + FcFontSet* fset = NULL; int curf; - char* retval = 0; + char* retval = NULL; int family_cnt; *index = 0; @@ -318,7 +318,7 @@ static void process_fontdata(fc_instance_t* priv, ass_library_t* library, FT_Lib char* fname; const char* fonts_dir = library->fonts_dir; char buf[1000]; - FILE* fp = 0; + FILE* fp = NULL; if (!fonts_dir) return; @@ -407,10 +407,7 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con if (!fc) { mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FontconfigDisabledDefaultFontWillBeUsed); - priv->config = NULL; - priv->path_default = strdup(path); - priv->index_default = 0; - return priv; + goto exit; } rc = FcInit(); @@ -419,7 +416,7 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con priv->config = FcConfigGetCurrent(); if (!priv->config) { mp_msg(MSGT_ASS, MSGL_FATAL, MSGTR_LIBASS_FcInitLoadConfigAndFontsFailed); - return 0; + goto exit; } for (i = 0; i < library->num_fontdata; ++i) @@ -467,8 +464,9 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con } } - priv->family_default = family ? strdup(family) : 0; - priv->path_default = path ? strdup(path) : 0; + priv->family_default = family ? strdup(family) : NULL; +exit: + priv->path_default = path ? strdup(path) : NULL; priv->index_default = 0; return priv; |