From d829ff768be362f228628600d498d18f0537e708 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 12 Nov 2005 17:07:11 +0000 Subject: [PATCH] * src/cache/ftccache.c (FTC_Cache_Clear), src/cache/ftcmanag.c (FTC_Manager_Check): Remove FT_EXPORT_DEF tag. * src/base/ftcalc.c (FT_Add64): Remove FT_EXPORT_DEF tag. (FT_Div64by32, FT_Sqrt32): Commented out. Unused. * include/freetype/internal/ftcalc.h (SQRT_32): Removed. Unused. (FT_Sqrt32): Commented out. Unused. * include/freetype/cache/ftccache.h: s/ftc_node_destroy/FTC_Node_Destroy/. * src/cache/ftccback.h (ftc_node_destroy): New declaration. * src/cache/ftccache.c (ftc_node_destroy): Use FT_LOCAL_DEF tag. (FTC_Node_Destroy): New exported wrapper function for ftc_node_destroy. * src/cache/ftcmanag.c: Include ftccback.c. --- ChangeLog | 22 ++++++++++++++++++++++ include/freetype/cache/ftccache.h | 2 +- include/freetype/internal/ftcalc.h | 7 ++++--- src/base/ftcalc.c | 14 +++++++++----- src/cache/ftccache.c | 12 ++++++++++-- src/cache/ftccback.h | 7 ++++++- src/cache/ftcmanag.c | 3 ++- 7 files changed, 54 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6cd782b60..8aa790d2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2005-11-11 Werner Lemberg + + * src/cache/ftccache.c (FTC_Cache_Clear), src/cache/ftcmanag.c + (FTC_Manager_Check): Remove FT_EXPORT_DEF tag. + + * src/base/ftcalc.c (FT_Add64): Remove FT_EXPORT_DEF tag. + (FT_Div64by32, FT_Sqrt32): Commented out. Unused. + + * include/freetype/internal/ftcalc.h (SQRT_32): Removed. Unused. + (FT_Sqrt32): Commented out. Unused. + + * include/freetype/cache/ftccache.h: + s/ftc_node_destroy/FTC_Node_Destroy/. + + * src/cache/ftccback.h (ftc_node_destroy): New declaration. + + * src/cache/ftccache.c (ftc_node_destroy): Use FT_LOCAL_DEF tag. + (FTC_Node_Destroy): New exported wrapper function for + ftc_node_destroy. + + * src/cache/ftcmanag.c: Include ftccback.c. + 2005-11-10 Werner Lemberg * src/autofit/afangles.c, src/autofit/aftypes.h (af_angle_diff): diff --git a/include/freetype/cache/ftccache.h b/include/freetype/cache/ftccache.h index f2e10281b..da2e9922f 100644 --- a/include/freetype/cache/ftccache.h +++ b/include/freetype/cache/ftccache.h @@ -79,7 +79,7 @@ FT_BEGIN_HEADER /* reserved for manager's use */ FT_EXPORT( void ) - ftc_node_destroy( FTC_Node node, + FTC_Node_Destroy( FTC_Node node, FTC_Manager manager ); diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h index 0df502c75..c89baa3e1 100644 --- a/include/freetype/internal/ftcalc.h +++ b/include/freetype/internal/ftcalc.h @@ -4,7 +4,7 @@ /* */ /* Arithmetic computations (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004 by */ +/* Copyright 1996-2001, 2002, 2003, 2004,2005 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -48,8 +48,7 @@ FT_BEGIN_HEADER FT_SqrtFixed( FT_Int32 x ); -#define SQRT_32( x ) FT_Sqrt32( x ) - +#if 0 /*************************************************************************/ /* */ @@ -69,6 +68,8 @@ FT_BEGIN_HEADER FT_EXPORT( FT_Int32 ) FT_Sqrt32( FT_Int32 x ); +#endif /* 0 */ + /*************************************************************************/ /* */ diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c index 8a9aeb618..4633945f6 100644 --- a/src/base/ftcalc.c +++ b/src/base/ftcalc.c @@ -99,6 +99,8 @@ } +#if 0 + /* documentation is in ftcalc.h */ FT_EXPORT_DEF( FT_Int32 ) @@ -128,6 +130,8 @@ return root; } +#endif /* 0 */ + #ifdef FT_LONG64 @@ -293,9 +297,7 @@ } - /* documentation is in ftcalc.h */ - - FT_EXPORT_DEF( void ) + static void FT_Add64( FT_Int64* x, FT_Int64* y, FT_Int64 *z ) @@ -526,10 +528,10 @@ } - /* documentation is in ftcalc.h */ +#if 0 /* apparently, the second version of this code is not compiled correctly */ - /* on Mac machines with the MPW C compiler.. tsss, tsss, tss... */ + /* on Mac machines with the MPW C compiler.. tsk, tsk, tsk... */ #if 1 @@ -621,6 +623,8 @@ #endif /* 0 */ +#endif /* 0 */ + #endif /* FT_LONG64 */ diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c index ad036805f..347079442 100644 --- a/src/cache/ftccache.c +++ b/src/cache/ftccache.c @@ -245,8 +245,16 @@ } - /* remove a node from the cache manager */ FT_EXPORT_DEF( void ) + FTC_Node_Destroy( FTC_Node node, + FTC_Manager manager ) + { + ftc_node_destroy( node, manager ); + } + + + /* remove a node from the cache manager */ + FT_LOCAL_DEF( void ) ftc_node_destroy( FTC_Node node, FTC_Manager manager ) { @@ -322,7 +330,7 @@ } - FT_EXPORT_DEF( void ) + static void FTC_Cache_Clear( FTC_Cache cache ) { if ( cache ) diff --git a/src/cache/ftccback.h b/src/cache/ftccback.h index 6b47e095e..5c4741fe3 100644 --- a/src/cache/ftccback.h +++ b/src/cache/ftccback.h @@ -4,7 +4,7 @@ /* */ /* Callback functions of the caching sub-system (specification only). */ /* */ -/* Copyright 2004 by */ +/* Copyright 2004, 2005 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -80,6 +80,11 @@ ftc_cache_done( FTC_Cache cache ); + FT_LOCAL( void ) + ftc_node_destroy( FTC_Node node, + FTC_Manager manager ); + + #endif /* __FTCCBACK_H__ */ /* END */ diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c index 337bea5f9..ccb9eda41 100644 --- a/src/cache/ftcmanag.c +++ b/src/cache/ftcmanag.c @@ -23,6 +23,7 @@ #include FT_INTERNAL_DEBUG_H #include FT_SIZES_H +#include "ftccback.h" #include "ftcerror.h" @@ -453,7 +454,7 @@ #ifdef FT_DEBUG_ERROR - FT_EXPORT_DEF( void ) + static void FTC_Manager_Check( FTC_Manager manager ) { FTC_Node node, first;