From 0529ba8d2579dcff1c287c40ea491ebc39fa24f5 Mon Sep 17 00:00:00 2001 From: David Turner Date: Sun, 3 Apr 2005 22:09:41 +0000 Subject: [PATCH] * include/freetype/config/ftoption.h: commenting the definition of FT_OPTIMIZE_MEMORY for the upcoming 2.1.10 release * src/autofit/afhints.c: small tweak to use a bit less heap memory within the auto-fitter --- ChangeLog | 8 ++++++++ devel/ftoption.h | 21 +-------------------- include/freetype/config/ftoption.h | 21 +-------------------- src/autofit/afhints.c | 4 ++-- 4 files changed, 12 insertions(+), 42 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60ff07b0e..64a234730 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-04-04 David Turner + + * include/freetype/config/ftoption.h: commenting the definition of + FT_OPTIMIZE_MEMORY for the upcoming 2.1.10 release + + * src/autofit/afhints.c: small tweak to use a bit less heap memory + within the auto-fitter + 2005-04-03 Werner Lemberg * src/type1/t1parse.c (T1_New_Parser): Relax the check for a valid diff --git a/devel/ftoption.h b/devel/ftoption.h index c7dbf1b72..f52340300 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.h @@ -549,31 +549,12 @@ FT_BEGIN_HEADER /* */ -/* - * The FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent - * improvements to the auto-hinter contributed by David Chester. They will - * most likely disappear completely in the next release. For now, you - * should always keep them defined. - * - */ -#define FT_CONFIG_OPTION_CHESTER_HINTS - -#ifdef FT_CONFIG_OPTION_CHESTER_HINTS - -#define FT_CONFIG_CHESTER_SMALL_F -#define FT_CONFIG_CHESTER_ASCENDER -#define FT_CONFIG_CHESTER_SERIF -#define FT_CONFIG_CHESTER_STEM -#define FT_CONFIG_CHESTER_BLUE_SCALE - -#endif /* FT_CONFIG_OPTION_CHESTER_HINTS */ - /* * This temporary macro is used to control various optimizations for * reducing the heap footprint of memory-mapped TrueType files. * */ -#define FT_OPTIMIZE_MEMORY +/* #define FT_OPTIMIZE_MEMORY */ FT_END_HEADER diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index 7c162cc38..17d879736 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -549,31 +549,12 @@ FT_BEGIN_HEADER /* */ -/* - * The FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent - * improvements to the auto-hinter contributed by David Chester. They will - * most likely disappear completely in the next release. For now, you - * should always keep them defined. - * - */ -#define FT_CONFIG_OPTION_CHESTER_HINTS - -#ifdef FT_CONFIG_OPTION_CHESTER_HINTS - -#define FT_CONFIG_CHESTER_SMALL_F -#define FT_CONFIG_CHESTER_ASCENDER -#define FT_CONFIG_CHESTER_SERIF -#define FT_CONFIG_CHESTER_STEM -#define FT_CONFIG_CHESTER_BLUE_SCALE - -#endif /* FT_CONFIG_OPTION_CHESTER_HINTS */ - /* * This temporary macro is used to control various optimizations for * reducing the heap footprint of memory-mapped TrueType files. * */ -#define FT_OPTIMIZE_MEMORY +/* #define FT_OPTIMIZE_MEMORY */ FT_END_HEADER diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c index ade4fd3b9..d81df01ff 100644 --- a/src/autofit/afhints.c +++ b/src/autofit/afhints.c @@ -42,7 +42,7 @@ goto Exit; } - new_max += ( new_max >> 1 ) + 4; + new_max += ( new_max >> 2 ) + 4; if ( new_max < old_max || new_max > big_max ) new_max = big_max; @@ -85,7 +85,7 @@ goto Exit; } - new_max += ( new_max >> 1 ) + 4; + new_max += ( new_max >> 2 ) + 4; if ( new_max < old_max || new_max > big_max ) new_max = big_max;