summaryrefslogtreecommitdiffstats
path: root/libass/ass_cache.c
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-28 22:17:33 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-28 22:17:33 +0000
commit3e13c098887cef24308a86150221428ce33a5c61 (patch)
tree665e320a46df4c71108e905062e15f8986aa6364 /libass/ass_cache.c
parentce96451ea68581afc68e5d8c54a0fb3936b8a745 (diff)
downloadlibass-3e13c098887cef24308a86150221428ce33a5c61.tar.bz2
libass-3e13c098887cef24308a86150221428ce33a5c61.tar.xz
Use (ass_font_t, char code) instead of (FT_Face, glyph index) to identify
glyphs in cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21364 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass/ass_cache.c')
-rw-r--r--libass/ass_cache.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libass/ass_cache.c b/libass/ass_cache.c
index 58ef9fd..ef81fa9 100644
--- a/libass/ass_cache.c
+++ b/libass/ass_cache.c
@@ -122,13 +122,13 @@ static int glyph_compare(glyph_hash_key_t* a, glyph_hash_key_t* b) {
static unsigned glyph_hash(glyph_hash_key_t* key) {
unsigned val = 0;
unsigned i;
- for (i = 0; i < sizeof(key->face); ++i)
- val += *(unsigned char *)(&(key->face) + i);
+ for (i = 0; i < sizeof(key->font); ++i)
+ val += *(unsigned char *)(&(key->font) + i);
val <<= 21;
if (key->bitmap) val &= 0x80000000;
if (key->be) val &= 0x40000000;
- val += key->index;
+ val += key->ch;
val += key->size << 8;
val += key->outline << 3;
val += key->advance.x << 10;