diff --git a/ChangeLog b/ChangeLog
index 4ba58f923..bde26fbd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-05-20  Kirill Smelkov  <kirr@mns.spb.ru>
+
+	* include/freetype/ftimage.h (FT_Raster_Params),
+	include/freetype/ftoutln.h (FT_Outline_Translate,
+	FT_Outline_Transform), src/base/ftoutln.c (FT_Outline_Translate,
+	FT_Outline_Transform): Decorate parameters with `const' where
+	appropriate.
+	Update all callers.
+
+	* src/raster/ftraster.c (ft_black_reset), src/smooth/ftgrays.c
+	(gray_raster_reset): Remove `const' from `pool_base' argument.
+
 2005-05-18  Kirill Smelkov  <kirr@mns.spb.ru>
 
 	* src/raster/ftmisc.h: New file.  Only needed if ftraster.c is
diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h
index 11822f3e5..aabcca47d 100644
--- a/include/freetype/ftimage.h
+++ b/include/freetype/ftimage.h
@@ -1031,7 +1031,7 @@ FT_BEGIN_HEADER
   typedef struct  FT_Raster_Params_
   {
     const FT_Bitmap*        target;
-    void*                   source;
+    const void*             source;
     int                     flags;
     FT_SpanFunc             gray_spans;
     FT_SpanFunc             black_spans;
diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h
index e7decd801..a6c602ab9 100644
--- a/include/freetype/ftoutln.h
+++ b/include/freetype/ftoutln.h
@@ -250,9 +250,9 @@ FT_BEGIN_HEADER
   /*    yOffset :: The vertical offset.                                    */
   /*                                                                       */
   FT_EXPORT( void )
-  FT_Outline_Translate( FT_Outline*  outline,
-                        FT_Pos       xOffset,
-                        FT_Pos       yOffset );
+  FT_Outline_Translate( const FT_Outline*  outline,
+                        FT_Pos             xOffset,
+                        FT_Pos             yOffset );
 
 
   /*************************************************************************/
@@ -299,8 +299,8 @@ FT_BEGIN_HEADER
   /*    outline's points.                                                  */
   /*                                                                       */
   FT_EXPORT( void )
-  FT_Outline_Transform( FT_Outline*       outline,
-                        const FT_Matrix*  matrix );
+  FT_Outline_Transform( const FT_Outline*  outline,
+                        const FT_Matrix*   matrix );
 
 
   /*************************************************************************/
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index 59d50403b..b0bbe1897 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -464,9 +464,9 @@
   /* documentation is in ftoutln.h */
 
   FT_EXPORT_DEF( void )
-  FT_Outline_Translate( FT_Outline*  outline,
-                        FT_Pos       xOffset,
-                        FT_Pos       yOffset )
+  FT_Outline_Translate( const FT_Outline*  outline,
+                        FT_Pos             xOffset,
+                        FT_Pos             yOffset )
   {
     FT_UShort   n;
     FT_Vector*  vec = outline->points;
@@ -641,8 +641,8 @@
   /* documentation is in ftoutln.h */
 
   FT_EXPORT_DEF( void )
-  FT_Outline_Transform( FT_Outline*       outline,
-                        const FT_Matrix*  matrix )
+  FT_Outline_Transform( const FT_Outline*  outline,
+                        const FT_Matrix*   matrix )
   {
     FT_Vector*  vec = outline->points;
     FT_Vector*  limit = vec + outline->n_points;
diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c
index d3e5bb1e9..cb9f946e5 100644
--- a/src/raster/ftraster.c
+++ b/src/raster/ftraster.c
@@ -3251,7 +3251,7 @@
 
   static void
   ft_black_reset( TRaster_Instance*  raster,
-                  const char*        pool_base,
+                  char*              pool_base,
                   long               pool_size )
   {
     if ( (&ras) && pool_base && pool_size >= 4096 )
@@ -3294,8 +3294,8 @@
   ft_black_render( TRaster_Instance*        raster,
                    const FT_Raster_Params*  params )
   {
-    FT_Outline*       outline    = (FT_Outline*)params->source;
-    const FT_Bitmap*  target_map = params->target;
+    const FT_Outline*  outline    = (const FT_Outline*)params->source;
+    const FT_Bitmap*   target_map = params->target;
 
 
     if ( !(&ras) || !ras.buff || !ras.sizeBuff )
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index f89db8cbe..99119159d 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -1963,8 +1963,8 @@
   gray_raster_render( PRaster                  raster,
                       const FT_Raster_Params*  params )
   {
-    FT_Outline*       outline    = (FT_Outline*)params->source;
-    const FT_Bitmap*  target_map = params->target;
+    const FT_Outline*  outline    = (const FT_Outline*)params->source;
+    const FT_Bitmap*   target_map = params->target;
 
 
     if ( !raster || !raster->cells || !raster->max_cells )
@@ -2131,7 +2131,7 @@
 
   static void
   gray_raster_reset( FT_Raster    raster,
-                     const char*  pool_base,
+                     char*        pool_base,
                      long         pool_size )
   {
     PRaster  rast = (PRaster)raster;