shithub: freetype+ttf2subf

Download patch

ref: 52a1e47a5c39eb66e3ec6895bffd370650cf3c20
parent: 0de5b376d7dba34a3f77a807792ac4266dcce675
author: suzuki toshiya <[email protected]>
date: Sun Jan 9 15:47:37 EST 2011 

[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.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2010-01-09  suzuki toshiya  <[email protected]>
 
+	[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  <[email protected]>
+
 	[cache] Correct a type mismatch under non-inlined config.
 
 	* src/cache/ftcglyph.h (FTC_GCACHE_LOOKUP_CMP):
--- a/src/cache/ftcglyph.c
+++ b/src/cache/ftcglyph.c
@@ -76,6 +76,8 @@
   }
 
 
+#ifdef FTC_INLINE
+
   FT_LOCAL_DEF( FT_Bool )
   FTC_GNode_Compare( FTC_GNode   gnode,
                      FTC_GQuery  gquery )
@@ -83,6 +85,7 @@
     return ftc_gnode_compare( FTC_NODE( gnode ), gquery, NULL );
   }
 
+#endif
 
   /*************************************************************************/
   /*************************************************************************/
--- a/src/cache/ftcglyph.h
+++ b/src/cache/ftcglyph.h
@@ -180,6 +180,8 @@
                   FT_UInt     gindex,  /* glyph index for node */
                   FTC_Family  family );
 
+#ifdef FTC_INLINE
+
   /* returns TRUE iff the query's glyph index correspond to the node;  */
   /* this assumes that the `family' and `hash' fields of the query are */
   /* already correctly set                                             */
@@ -186,6 +188,8 @@
   FT_LOCAL( FT_Bool )
   FTC_GNode_Compare( FTC_GNode   gnode,
                      FTC_GQuery  gquery );
+
+#endif
 
   /* call this function to clear a node's family -- this is necessary */
   /* to implement the `node_remove_faceid' cache method correctly     */
--- a/src/cache/ftcsbits.c
+++ b/src/cache/ftcsbits.c
@@ -401,6 +401,8 @@
   }
 
 
+#ifdef FTC_INLINE
+
   FT_LOCAL_DEF( FT_Bool )
   FTC_SNode_Compare( FTC_SNode   snode,
                      FTC_GQuery  gquery,
@@ -409,5 +411,6 @@
     return ftc_snode_compare( FTC_NODE( snode ), gquery, cache );
   }
 
+#endif
 
 /* END */
--- a/src/cache/ftcsbits.h
+++ b/src/cache/ftcsbits.h
@@ -83,10 +83,14 @@
 #endif
 
 
+#ifdef FTC_INLINE
+
   FT_LOCAL( FT_Bool )
   FTC_SNode_Compare( FTC_SNode   snode,
                      FTC_GQuery  gquery,
                      FTC_Cache   cache );
+
+#endif
 
   /* */