diff --git a/ChangeLog b/ChangeLog
index 5eab0e31a..455e186ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-31  Werner Lemberg  <wl@gnu.org>
+
+	* src/pcf/pcfread (pcf_load_font), src/bdf/bdfdrivr.c
+	(BDF_Face_Init), src/truetype/ttgxvar (TT_Get_MM_Var,
+	tt_face_vary_cvt): Fix compiler warnings.
+
 2004-07-26  Søren Sandmann  <sandmann@daimi.au.dk>
 
 	* src/pcf/pcfread.c (pcf_interpret_style): Always allocate memory for
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 1aa3904a9..e8b0451ab 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -416,7 +416,7 @@ THE SOFTWARE.
 
         FT_MEM_ZERO( bsize, sizeof ( FT_Bitmap_Size ) );
 
-        bsize->height = font->font_ascent + font->font_descent;
+        bsize->height = (FT_Short)( font->font_ascent + font->font_descent );
 
         prop = bdf_get_font_property( font, "AVERAGE_WIDTH" );
         if ( prop )
diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
index 61af96f97..f31b15e2d 100644
--- a/src/pcf/pcfread.c
+++ b/src/pcf/pcfread.c
@@ -1102,7 +1102,8 @@ THE SOFTWARE.
 
         FT_MEM_ZERO( bsize, sizeof ( FT_Bitmap_Size ) );
 
-        bsize->height = face->accel.fontAscent + face->accel.fontDescent;
+        bsize->height = (FT_Short)( face->accel.fontAscent +
+                                    face->accel.fontDescent );
 
         prop = pcf_find_property( face, "AVERAGE_WIDTH" );
         if ( prop )
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 38fbde1ab..696457a98 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -736,10 +736,10 @@
         a->maximum = axis_rec.maxValue;     /* A Fixed */
         a->strid   = axis_rec.nameID;
 
-        a->name[0] =   a->tag >> 24;
-        a->name[1] = ( a->tag >> 16 ) & 0xFF;
-        a->name[2] = ( a->tag >>  8 ) & 0xFF;
-        a->name[3] = ( a->tag       ) & 0xFF;
+        a->name[0] = (FT_String)(   a->tag >> 24 );
+        a->name[1] = (FT_String)( ( a->tag >> 16 ) & 0xFF );
+        a->name[2] = (FT_String)( ( a->tag >>  8 ) & 0xFF );
+        a->name[3] = (FT_String)( ( a->tag       ) & 0xFF );
         a->name[4] = 0;
 
         ++a;
@@ -1238,13 +1238,15 @@
       {
         /* this means that there are deltas for every entry in cvt */
         for ( j = 0; j < face->cvt_size; ++j )
-          face->cvt[j] += FT_MulFix( deltas[j], apply );
+          face->cvt[j] += (FT_Short)FT_MulFix( deltas[j],
+                                               apply );
       }
 
       else
       {
         for ( j = 0; j < point_count; ++j )
-          face->cvt[localpoints[j]] += FT_MulFix( deltas[j], apply );
+          face->cvt[localpoints[j]] += (FT_Short)FT_MulFix( deltas[j],
+                                                            apply );
       }
 
       if ( localpoints != ALL_POINTS )