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

Remove bbox and advance vector from bitmap cache. 

They are now available from glyph cache.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23044 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2007-04-20 23:14:12 +00:00
parent 35cc43696d
commit f3375f1b4d
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libass/ass_cache.h
View File

@ -47,8 +47,6 @@ typedef struct bitmap_hash_val_s {
bitmap_t* bm; // the actual bitmaps
bitmap_t* bm_o;
bitmap_t* bm_s;
FT_BBox bbox_scaled; // bbox after scaling, but before rotation
FT_Vector advance; // 26.6, advance distance to the next bitmap in line
} bitmap_hash_val_t;
void ass_bitmap_cache_init(void);

6
libass/ass_render.c
View File

@ -410,12 +410,9 @@ static ass_image_t* render_text(text_info_t* text_info, int dst_x, int dst_y)
if (text_info->glyphs[i].hash_key.frx == 0 &&
text_info->glyphs[i].hash_key.fry == 0 &&
text_info->glyphs[i].hash_key.frz == 0) {
hash_val.bbox_scaled = text_info->glyphs[i].bbox;
hash_val.bm_o = text_info->glyphs[i].bm_o;
hash_val.bm = text_info->glyphs[i].bm;
hash_val.bm_s = text_info->glyphs[i].bm_s;
hash_val.advance.x = text_info->glyphs[i].advance.x;
hash_val.advance.y = text_info->glyphs[i].advance.y;
cache_add_bitmap(&(text_info->glyphs[i].hash_key), &hash_val);
}
@ -1306,9 +1303,6 @@ static void get_bitmap_glyph(int symbol, glyph_info_t* info, FT_Vector* advance)
info->bm = val->bm;
info->bm_o = val->bm_o;
info->bm_s = val->bm_s;
info->bbox = val->bbox_scaled;
info->advance.x = val->advance.x;
info->advance.y = val->advance.y;
} else
info->bm = info->bm_o = info->bm_s = 0;
}