diff options
author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-20 23:02:20 +0000 |
---|---|---|
committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-20 23:02:20 +0000 |
commit | 6c412d239ba1c2dc2484dc49392ab50cc6b2d3fb (patch) | |
tree | d7bdb648a7bf28e735fc66a48c9b6caa55c50569 /libass/ass_cache.h | |
parent | 4408714100860452be4ecf9e7e6b8cc7527955d9 (diff) | |
download | mpv-6c412d239ba1c2dc2484dc49392ab50cc6b2d3fb.tar.bz2 mpv-6c412d239ba1c2dc2484dc49392ab50cc6b2d3fb.tar.xz |
Rename glyph cache to bitmap cache.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23035 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass/ass_cache.h')
-rw-r--r-- | libass/ass_cache.h | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/libass/ass_cache.h b/libass/ass_cache.h index 8e074579db..67fac337ec 100644 --- a/libass/ass_cache.h +++ b/libass/ass_cache.h @@ -27,8 +27,8 @@ void ass_font_cache_add(ass_font_t* font); void ass_font_cache_done(void); -// describes a glyph; glyphs with equivalents structs are considered identical -typedef struct glyph_hash_key_s { +// describes a bitmap; bitmaps with equivalents structs are considered identical +typedef struct bitmap_hash_key_s { char bitmap; // bool : true = bitmap, false = outline ass_font_t* font; int size; // font size @@ -37,28 +37,27 @@ typedef struct glyph_hash_key_s { int bold, italic; char be; // blur edges - // the following affects bitmap glyphs only unsigned scale_x, scale_y; // 16.16 int frx, fry, frz; // signed 16.16 FT_Vector advance; // subpixel shift vector -} glyph_hash_key_t; +} bitmap_hash_key_t; -typedef struct glyph_hash_val_s { - bitmap_t* bm; // the actual glyph bitmaps +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 glyph in line -} glyph_hash_val_t; + FT_Vector advance; // 26.6, advance distance to the next bitmap in line +} bitmap_hash_val_t; -void ass_glyph_cache_init(void); -void cache_add_glyph(glyph_hash_key_t* key, glyph_hash_val_t* val); -glyph_hash_val_t* cache_find_glyph(glyph_hash_key_t* key); -void ass_glyph_cache_reset(void); -void ass_glyph_cache_done(void); +void ass_bitmap_cache_init(void); +void cache_add_bitmap(bitmap_hash_key_t* key, bitmap_hash_val_t* val); +bitmap_hash_val_t* cache_find_bitmap(bitmap_hash_key_t* key); +void ass_bitmap_cache_reset(void); +void ass_bitmap_cache_done(void); -typedef struct hashmap_s hashmap_t; +typedef struct hashmap_s hashmap_t; typedef void (*hashmap_item_dtor_t)(void* key, size_t key_size, void* value, size_t value_size); typedef int (*hashmap_key_compare_t)(void* key1, void* key2, size_t key_size); typedef unsigned (*hashmap_hash_t)(void* key, size_t key_size); |