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

Minor code simplification. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23193 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2007-05-01 15:21:34 +00:00
parent eaa1f9ab16
commit 6deff1f55a
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libass/ass_render.c
View File

@ -394,29 +394,31 @@ static ass_image_t* render_text(text_info_t* text_info, int dst_x, int dst_y)
ass_image_t** tail = &head; ass_image_t** tail = &head;
for (i = 0; i < text_info->length; ++i) { for (i = 0; i < text_info->length; ++i) {
if (text_info->glyphs[i].glyph && text_info->glyphs[i].bm == 0) { glyph_info_t* info = text_info->glyphs + i;
if ((text_info->glyphs[i].symbol == '\n') || (text_info->glyphs[i].symbol == 0)) if (info->glyph && info->bm == 0) {
if ((info->symbol == '\n') || (info->symbol == 0))
continue; continue;
error = glyph_to_bitmap(ass_renderer->synth_priv, error = glyph_to_bitmap(ass_renderer->synth_priv,
text_info->glyphs[i].glyph, text_info->glyphs[i].outline_glyph, info->glyph, info->outline_glyph,
&text_info->glyphs[i].bm, &text_info->glyphs[i].bm_o, &info->bm, &info->bm_o,
&text_info->glyphs[i].bm_s, text_info->glyphs[i].be); &info->bm_s, info->be);
if (error) if (error)
text_info->glyphs[i].symbol = 0; info->symbol = 0;
// cache // cache
hash_val.bm_o = text_info->glyphs[i].bm_o; hash_val.bm_o = info->bm_o;
hash_val.bm = text_info->glyphs[i].bm; hash_val.bm = info->bm;
hash_val.bm_s = text_info->glyphs[i].bm_s; hash_val.bm_s = info->bm_s;
cache_add_bitmap(&(text_info->glyphs[i].hash_key), &hash_val); cache_add_bitmap(&(info->hash_key), &hash_val);
} }
} }
for (i = 0; i < text_info->length; ++i) { for (i = 0; i < text_info->length; ++i) {
if (text_info->glyphs[i].glyph) glyph_info_t* info = text_info->glyphs + i;
FT_Done_Glyph(text_info->glyphs[i].glyph); if (info->glyph)
if (text_info->glyphs[i].outline_glyph) FT_Done_Glyph(info->glyph);
FT_Done_Glyph(text_info->glyphs[i].outline_glyph); if (info->outline_glyph)
FT_Done_Glyph(info->outline_glyph);
} }
for (i = 0; i < text_info->length; ++i) { for (i = 0; i < text_info->length; ++i) {