From 39c91ad444ac05cc45b54ff48d2d5b70dde01904 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 28 Jul 2007 05:40:40 +0000 Subject: [PATCH] * src/raster/ftraster.c (count_table): Make it conditional. * src/base/ftobjs.c (FT_New_Library): Check FT_RENDER_POOL_SIZE with a preprocessor statement. --- ChangeLog | 6 ++++++ src/base/ftobjs.c | 7 ++++--- src/raster/ftraster.c | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9db3be5c1..a45ff14ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-28 Werner Lemberg + + * src/raster/ftraster.c (count_table): Make it conditional. + * src/base/ftobjs.c (FT_New_Library): Check FT_RENDER_POOL_SIZE with + a preprocessor statement. + 2007-07-27 Werner Lemberg * src/base/ftoutln.c (FT_Outline_Translate): Check `outline' before diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 1bcccf716..f39deae25 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -3726,9 +3726,10 @@ /* allocate the render pool */ library->raster_pool_size = FT_RENDER_POOL_SIZE; - if ( FT_RENDER_POOL_SIZE > 0 ) - if ( FT_ALLOC( library->raster_pool, FT_RENDER_POOL_SIZE ) ) - goto Fail; +#if FT_RENDER_POOL_SIZE > 0 + if ( FT_ALLOC( library->raster_pool, FT_RENDER_POOL_SIZE ) ) + goto Fail; +#endif /* That's ok now */ *alibrary = library; diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index 4cfca4ed0..421830876 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -543,6 +543,8 @@ #endif /* FT_STATIC_RASTER */ +#ifdef FT_RASTER_OPTION_ANTI_ALIASING + static const char count_table[256] = { 0 , 1 , 1 , 2 , 1 , 2 , 2 , 3 , 1 , 2 , 2 , 3 , 2 , 3 , 3 , 4, @@ -562,6 +564,8 @@ static const char count_table[256] = 3 , 4 , 4 , 5 , 4 , 5 , 5 , 6 , 4 , 5 , 5 , 6 , 5 , 6 , 6 , 7, 4 , 5 , 5 , 6 , 5 , 6 , 6 , 7 , 5 , 6 , 6 , 7 , 6 , 7 , 7 , 8 }; +#endif /* FT_RASTER_OPTION_ANTI_ALIASING */ + /*************************************************************************/