Commit 6c0d8814189ea5cf03de66b31be9542f3ac79db1

Chris Liddell 2010-03-11T18:27:31

Fix Savannah bug #27442. * src/raster/ftraster.c (ft_black_reset): Fix `buffer_size'.

diff --git a/ChangeLog b/ChangeLog
index 977a7a8..e2ad379 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-11  Chris Liddell  <chris.liddell@artifex.com>
+
+	Fix Savannah bug #27442.
+
+	* src/raster/ftraster.c (ft_black_reset): Fix `buffer_size'.
+
 2010-03-09  Werner Lemberg  <wl@gnu.org>
 
 	Remove unused variable.
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c
index 23ad592..86d11d8 100644
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType glyph rasterizer (body).                                */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2005, 2007, 2008, 2009 by             */
+/*  Copyright 1996-2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010 by       */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -3447,9 +3447,8 @@
         PWorker  worker = (PWorker)pool_base;
 
 
-        raster->buffer      = pool_base + ( (sizeof ( *worker ) + 7 ) & ~7 );
-        raster->buffer_size = ( ( pool_base + pool_size ) -
-                                (char*)raster->buffer ) / sizeof ( Long );
+        raster->buffer      = pool_base + ( ( sizeof ( *worker ) + 7 ) & ~7 );
+        raster->buffer_size = pool_base + pool_size - (char*)raster->buffer;
         raster->worker      = worker;
       }
       else