* src/raster/ftraster.c (count_table): Make it conditional.

18 years ago · 39c91ad444
parent 71dd687310
commit 39c91ad444
3 changed files with 14 additions and 3 deletions
--- a/6
+++ b/6
@ -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
--- 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;
--- 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 */
+


  /*************************************************************************/