diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-01-09 22:38:10 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-01-09 22:38:10 +0900 |
| commit | 62d116f8d651d24f6e5511b4c91feec2dff50d8e (patch) | |
| tree | 369511f4a4a64e899677956b0b6696af64d20146 | |
| parent | 9a2e255b23e44ee9e2ae8c1e5d50cf3ccb26ef16 (diff) | |
| download | freetype2-62d116f8d651d24f6e5511b4c91feec2dff50d8e.tar.gz | |
[cache] Fit FTC_GNode_Compare() to FTC_Node_CompareFunc.
* src/cache/ftcglyph.h (FTC_GNode_Compare): Add the 3rd
argument `FTC_Cache cache' to fit FTC_Node_CompareFunc
prototype.
* src/cache/ftcglyph.c (FTC_GNode_Compare): Ditto. Anyway,
`cache' is not used by its child ftc_gnode_compare().
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/cache/ftcglyph.c | 5 | ||||
| -rw-r--r-- | src/cache/ftcglyph.h | 3 |
3 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,15 @@ 2010-01-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + [cache] Fit FTC_GNode_Compare() to FTC_Node_CompareFunc. + + * src/cache/ftcglyph.h (FTC_GNode_Compare): Add the 3rd + argument `FTC_Cache cache' to fit FTC_Node_CompareFunc + prototype. + * src/cache/ftcglyph.c (FTC_GNode_Compare): Ditto. Anyway, + `cache' is not used by its child ftc_gnode_compare(). + +2010-01-09 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + [cache] Deduplicate the code to get the top node by a hash. There are several duplicated codes getting the top node diff --git a/src/cache/ftcglyph.c b/src/cache/ftcglyph.c index fb825d450..52a79335b 100644 --- a/src/cache/ftcglyph.c +++ b/src/cache/ftcglyph.c @@ -80,9 +80,10 @@ FT_LOCAL_DEF( FT_Bool ) FTC_GNode_Compare( FTC_GNode gnode, - FTC_GQuery gquery ) + FTC_GQuery gquery, + FTC_Cache cache ) { - return ftc_gnode_compare( FTC_NODE( gnode ), gquery, NULL ); + return ftc_gnode_compare( FTC_NODE( gnode ), gquery, cache ); } #endif diff --git a/src/cache/ftcglyph.h b/src/cache/ftcglyph.h index 06b2031b2..36567438c 100644 --- a/src/cache/ftcglyph.h +++ b/src/cache/ftcglyph.h @@ -187,7 +187,8 @@ FT_BEGIN_HEADER /* already correctly set */ FT_LOCAL( FT_Bool ) FTC_GNode_Compare( FTC_GNode gnode, - FTC_GQuery gquery ); + FTC_GQuery gquery, + FTC_Cache cache ); #endif |