diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-09-27 16:55:44 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2009-09-27 16:55:44 +0900 |
| commit | 82633a2440d48ed22a1f70062d8926c37f9dcf31 (patch) | |
| tree | eab2cb53eca67edd191a522ceb3f24783717491e /src/cache/ftcglyph.h | |
| parent | f2647ddabb458c89e13937800b3fc95e71bd1482 (diff) | |
| download | freetype2-82633a2440d48ed22a1f70062d8926c37f9dcf31.tar.gz | |
[cache] Fix Savannah bug #27441, cleanup Redhat bugzilla #513582.
Diffstat (limited to 'src/cache/ftcglyph.h')
| -rw-r--r-- | src/cache/ftcglyph.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/cache/ftcglyph.h b/src/cache/ftcglyph.h index 87a4199bf..c18f9c3af 100644 --- a/src/cache/ftcglyph.h +++ b/src/cache/ftcglyph.h @@ -277,12 +277,14 @@ FT_BEGIN_HEADER FTC_GCache _gcache = FTC_GCACHE( cache ); \ FTC_GQuery _gquery = (FTC_GQuery)( query ); \ FTC_MruNode_CompareFunc _fcompare = (FTC_MruNode_CompareFunc)(famcmp); \ + FTC_MruNode _mrunode; \ \ \ _gquery->gindex = (gindex); \ \ FTC_MRULIST_LOOKUP_CMP( &_gcache->families, _gquery, _fcompare, \ - _gquery->family, error ); \ + _mrunode, error ); \ + _gquery->family = FTC_FAMILY( _mrunode ); \ if ( !error ) \ { \ FTC_Family _gqfamily = _gquery->family; \ @@ -303,11 +305,10 @@ FT_BEGIN_HEADER #define FTC_GCACHE_LOOKUP_CMP( cache, famcmp, nodecmp, hash, \ gindex, query, node, error ) \ FT_BEGIN_STMNT \ - void* _n = &(node); \ - \ \ error = FTC_GCache_Lookup( FTC_GCACHE( cache ), hash, gindex, \ - FTC_GQUERY( query ), (FTC_Node*)_n ); \ + FTC_GQUERY( query ), node ); \ + \ FT_END_STMNT #endif /* !FTC_INLINE */ |