From 62d116f8d651d24f6e5511b4c91feec2dff50d8e Mon Sep 17 00:00:00 2001 From: suzuki toshiya Date: Sun, 9 Jan 2011 22:38:10 +0900 Subject: [PATCH] [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(). --- ChangeLog | 10 ++++++++++ src/cache/ftcglyph.c | 5 +++-- src/cache/ftcglyph.h | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 112f18bc6..0d8506d43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-01-09 suzuki toshiya + + [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 [cache] Deduplicate the code to get the top node by a hash. 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