diff --git a/ChangeLog b/ChangeLog
index 538269a66..892ef74c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-02  Werner Lemberg  <wl@gnu.org>
+
+	* src/truetype/ttgload.c (compute_glyph_metrics): Fix compiler
+	warnings.
+
 2004-06-01  Werner Lemberg  <wl@gnu.org>
 
 	* src/sfnt/sfobjs.c (tt_face_get_name): Make sure that an English
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index b0093f982..0256ee698 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -1677,13 +1677,13 @@
       FT_Pos     top;      /* scaled vertical top side bearing  */
       FT_Pos     advance;  /* scaled vertical advance height    */
 
+
       /* Get the unscaled top bearing and advance height. */
       if ( face->vertical_info &&
            face->vertical.number_Of_VMetrics > 0 )
       {
-        advance_height = loader->pp4.y - loader->pp3.y;
-        top_bearing    = loader->pp3.y - bbox.yMax;
-
+        advance_height = (FT_UShort)( loader->pp4.y - loader->pp3.y );
+        top_bearing    = (FT_Short)( loader->pp3.y - bbox.yMax );
       }
       else
       {