forked from minhngoc25a/freetype2
[cache] inline-specific functions are conditionalized.
* src/cache/ftcglyph.c (FTC_GNode_Compare): Conditionalized for inlined config. This function is a thin wrapper of ftc_gnode_compare() for inlined FTC_CACHE_LOOKUP_CMP() (see `nodecmp' argument). Under non-inlined config, ftc_gnode_compare() is invoked by FTC_Cache_Lookup(), via FTC_Cache->clazz.node_compare(). * src/cache/ftcglyph.h (FTC_GNode_Compare): Ditto. * src/cache/ftcsbits.c (FTC_SNode_Compare): Ditto, for ftc_snode_compare(). * src/cache/ftcsbits.h (FTC_SNode_Compare): Ditto.
This commit is contained in:
parent
0de5b376d7
commit
52a1e47a5c
16
ChangeLog
16
ChangeLog
|
@ -1,3 +1,19 @@
|
||||||
|
2010-01-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
|
[cache] inline-specific functions are conditionalized.
|
||||||
|
|
||||||
|
* src/cache/ftcglyph.c (FTC_GNode_Compare): Conditionalized
|
||||||
|
for inlined config. This function is a thin wrapper of
|
||||||
|
ftc_gnode_compare() for inlined FTC_CACHE_LOOKUP_CMP()
|
||||||
|
(see `nodecmp' argument). Under non-inlined config,
|
||||||
|
ftc_gnode_compare() is invoked by FTC_Cache_Lookup(),
|
||||||
|
via FTC_Cache->clazz.node_compare().
|
||||||
|
|
||||||
|
* src/cache/ftcglyph.h (FTC_GNode_Compare): Ditto.
|
||||||
|
* src/cache/ftcsbits.c (FTC_SNode_Compare): Ditto,
|
||||||
|
for ftc_snode_compare().
|
||||||
|
* src/cache/ftcsbits.h (FTC_SNode_Compare): Ditto.
|
||||||
|
|
||||||
2010-01-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
2010-01-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
[cache] Correct a type mismatch under non-inlined config.
|
[cache] Correct a type mismatch under non-inlined config.
|
||||||
|
|
|
@ -76,6 +76,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef FTC_INLINE
|
||||||
|
|
||||||
FT_LOCAL_DEF( FT_Bool )
|
FT_LOCAL_DEF( FT_Bool )
|
||||||
FTC_GNode_Compare( FTC_GNode gnode,
|
FTC_GNode_Compare( FTC_GNode gnode,
|
||||||
FTC_GQuery gquery )
|
FTC_GQuery gquery )
|
||||||
|
@ -83,6 +85,7 @@
|
||||||
return ftc_gnode_compare( FTC_NODE( gnode ), gquery, NULL );
|
return ftc_gnode_compare( FTC_NODE( gnode ), gquery, NULL );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
|
@ -180,6 +180,8 @@ FT_BEGIN_HEADER
|
||||||
FT_UInt gindex, /* glyph index for node */
|
FT_UInt gindex, /* glyph index for node */
|
||||||
FTC_Family family );
|
FTC_Family family );
|
||||||
|
|
||||||
|
#ifdef FTC_INLINE
|
||||||
|
|
||||||
/* returns TRUE iff the query's glyph index correspond to the node; */
|
/* returns TRUE iff the query's glyph index correspond to the node; */
|
||||||
/* this assumes that the `family' and `hash' fields of the query are */
|
/* this assumes that the `family' and `hash' fields of the query are */
|
||||||
/* already correctly set */
|
/* already correctly set */
|
||||||
|
@ -187,6 +189,8 @@ FT_BEGIN_HEADER
|
||||||
FTC_GNode_Compare( FTC_GNode gnode,
|
FTC_GNode_Compare( FTC_GNode gnode,
|
||||||
FTC_GQuery gquery );
|
FTC_GQuery gquery );
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
/* call this function to clear a node's family -- this is necessary */
|
/* call this function to clear a node's family -- this is necessary */
|
||||||
/* to implement the `node_remove_faceid' cache method correctly */
|
/* to implement the `node_remove_faceid' cache method correctly */
|
||||||
FT_LOCAL( void )
|
FT_LOCAL( void )
|
||||||
|
|
|
@ -401,6 +401,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef FTC_INLINE
|
||||||
|
|
||||||
FT_LOCAL_DEF( FT_Bool )
|
FT_LOCAL_DEF( FT_Bool )
|
||||||
FTC_SNode_Compare( FTC_SNode snode,
|
FTC_SNode_Compare( FTC_SNode snode,
|
||||||
FTC_GQuery gquery,
|
FTC_GQuery gquery,
|
||||||
|
@ -409,5 +411,6 @@
|
||||||
return ftc_snode_compare( FTC_NODE( snode ), gquery, cache );
|
return ftc_snode_compare( FTC_NODE( snode ), gquery, cache );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
/* END */
|
/* END */
|
||||||
|
|
|
@ -83,11 +83,15 @@ FT_BEGIN_HEADER
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef FTC_INLINE
|
||||||
|
|
||||||
FT_LOCAL( FT_Bool )
|
FT_LOCAL( FT_Bool )
|
||||||
FTC_SNode_Compare( FTC_SNode snode,
|
FTC_SNode_Compare( FTC_SNode snode,
|
||||||
FTC_GQuery gquery,
|
FTC_GQuery gquery,
|
||||||
FTC_Cache cache );
|
FTC_Cache cache );
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
|
|
||||||
FT_END_HEADER
|
FT_END_HEADER
|
||||||
|
|
Loading…
Reference in New Issue