Dmitry Timoshkov : sfnt2fnt: Take into account external leading when calculating the font point size.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 65dbecbb5a3ca4a730a570354b45b987017832ea
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=65dbecbb5a3ca4a730a570354b...

Author: Dmitry Timoshkov <dmitry(a)codeweavers.com>
Date:   Mon May 11 20:56:02 2009 +0900

sfnt2fnt: Take into account external leading when calculating the font point size.

This makes the dfPoints field of the Japanese System font match the Windows one.

---

 tools/sfnt2fnt.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c
index 6880ee8..de19d8f 100644
--- a/tools/sfnt2fnt.c
+++ b/tools/sfnt2fnt.c
@@ -414,7 +414,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc,
     info->dfCharTable[i].offset = start + (width_bytes * ppem);
 
     info->hdr.fi.dfType = 0;
-    info->hdr.fi.dfPoints = ((ppem - il) * 72 + dpi/2) / dpi;
+    info->hdr.fi.dfPoints = ((ppem - il - el) * 72 + dpi/2) / dpi;
     info->hdr.fi.dfVertRes = dpi;
     info->hdr.fi.dfHorizRes = dpi;
     info->hdr.fi.dfAscent = ascent;