Mercurial > mplayer.hg
changeset 23022:199a3c6f54e8
Make get_*_glyph return void.
| author | eugeni |
|---|---|
| date | Fri, 20 Apr 2007 23:10:33 +0000 |
| parents | a81c390d4a22 |
| children | 0694bbf7ac84 |
| files | libass/ass_render.c |
| diffstat | 1 files changed, 5 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/libass/ass_render.c Fri Apr 20 23:09:48 2007 +0000 +++ b/libass/ass_render.c Fri Apr 20 23:10:33 2007 +0000 @@ -1224,7 +1224,7 @@ { } -static int get_outline_glyph(int symbol, glyph_info_t* info, FT_Vector* advance) +static void get_outline_glyph(int symbol, glyph_info_t* info, FT_Vector* advance) { int error; glyph_hash_val_t* val; @@ -1250,7 +1250,7 @@ glyph_hash_val_t v; info->glyph = ass_font_get_glyph(frame_context.ass_priv->fontconfig_priv, render_context.font, symbol); if (!info->glyph) - return 0; + return; info->advance.x = d16_to_d6(info->glyph->advance.x); info->advance.y = d16_to_d6(info->glyph->advance.y); FT_Glyph_Get_CBox( info->glyph, FT_GLYPH_BBOX_PIXELS, &info->bbox); @@ -1268,7 +1268,6 @@ mp_msg(MSGT_ASS, MSGL_WARN, MSGTR_LIBASS_FT_Glyph_Stroke_Error, error); } } - return 0; } /** @@ -1279,9 +1278,8 @@ * \param advance advance vector of the extracted glyph * \return 0 on success */ -static int get_bitmap_glyph(int symbol, glyph_info_t* info, FT_Vector* advance) +static void get_bitmap_glyph(int symbol, glyph_info_t* info, FT_Vector* advance) { - int error; bitmap_hash_val_t* val; bitmap_hash_key_t* key = &(info->hash_key); @@ -1311,8 +1309,6 @@ info->advance.y = val->advance.y; } else info->bm = info->bm_o = info->bm_s = 0; - - return 0; } /** @@ -1767,12 +1763,8 @@ ass_font_set_transform(render_context.font, &matrix, &shift ); } - error = get_outline_glyph(code, text_info.glyphs + text_info.length, &shift); - error |= get_bitmap_glyph(code, text_info.glyphs + text_info.length, &shift); - - if (error) { - continue; - } + get_outline_glyph(code, text_info.glyphs + text_info.length, &shift); + get_bitmap_glyph(code, text_info.glyphs + text_info.length, &shift); text_info.glyphs[text_info.length].pos.x = pen.x >> 6; text_info.glyphs[text_info.length].pos.y = pen.y >> 6;