Mercurial > mplayer.hg

changeset 23026:91076557ab81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove bbox and advance vector from bitmap cache. They are now available from glyph cache.
author eugeni
date Fri, 20 Apr 2007 23:14:12 +0000
parents ab0943242d1a
children b4db05aea29e
files libass/ass_cache.h libass/ass_render.c
diffstat 2 files changed, 0 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libass/ass_cache.h	Fri Apr 20 23:13:34 2007 +0000
+++ b/libass/ass_cache.h	Fri Apr 20 23:14:12 2007 +0000
@@ -47,8 +47,6 @@
 	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);
--- a/libass/ass_render.c	Fri Apr 20 23:13:34 2007 +0000
+++ b/libass/ass_render.c	Fri Apr 20 23:14:12 2007 +0000
@@ -410,12 +410,9 @@
 			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 @@
 		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;
 }