kc3-lang/freetype

diff --git a/ChangeLog b/ChangeLog
index db7daae..e7d38ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-01  Werner Lemberg  <wl@gnu.org>
+
+	* docs/CHANGES: Updated.
+
+2004-01-01  Michael Jansson  <mjan@em2-solutions.com>
+
+	* src/winfonts/winfnt.c (FNT_Size_Set_Pixels): Fix sign of
+	size->metrics.descender.
+
 2003-12-31  Wolfgang Domröse  <porthos.domroese@harz.de>
 
 	* src/cff/cffgload.c (cff_decoder_parse_charstrings)
diff --git a/docs/CHANGES b/docs/CHANGES
index 2e3061a..eaa3d1a 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -24,6 +24,9 @@ LATEST CHANGES BETWEEN 2.1.8 and 2.1.7
       but one encoding.  Use  the new FT_WinFNT_ID_XXX values together
       with FT_Get_WinFNT_Header() to get the WinFNT charset ID.
 
+    - The descender metrics (face->size->metrics.descender) for WinFNT
+      bitmap fonts had the wrong sign.
+
 
   II. IMPORTANT CHANGES
 
diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c
index 9aaebdd..e6f7edc 100644
--- a/src/winfonts/winfnt.c
+++ b/src/winfonts/winfnt.c
@@ -543,8 +543,8 @@
 
 
       size->metrics.ascender    = font->header.ascent * 64;
-      size->metrics.descender   = ( font->header.pixel_height -
-                                      font->header.ascent ) * 64;
+      size->metrics.descender   = -( font->header.pixel_height -
+                                       font->header.ascent ) * 64;
       size->metrics.height      = font->header.pixel_height * 64;
       size->metrics.max_advance = font->header.max_width * 64;