Commit 39c91ad444ac05cc45b54ff48d2d5b70dde01904
2007-07-28T05:40:40
* 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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/ChangeLog b/ChangeLog
index 9db3be5..a45ff14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-28 Werner Lemberg <wl@gnu.org>
+
+ * 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 <wl@gnu.org>
* src/base/ftoutln.c (FT_Outline_Translate): Check `outline' before
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 1bcccf7..f39deae 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 4cfca4e..4218308 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 */
+
/*************************************************************************/