Huw Davies : gdi32: FreeType's idea of metrics has changed for bitmap fonts .

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: bae6d23c5cfee3794fbd78ea19ba9d60a363e142
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=bae6d23c5cfee3794fbd78ea...

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Thu Jun  1 15:12:30 2006 +0100

gdi32: FreeType's idea of metrics has changed for bitmap fonts.

---

 dlls/gdi/freetype.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c
index abb33f9..9f52e60 100644
--- a/dlls/gdi/freetype.c
+++ b/dlls/gdi/freetype.c
@@ -928,7 +928,7 @@ static void DumpFontList(void)
             face = LIST_ENTRY(face_elem_ptr, Face, entry);
 	    TRACE("\t%s\t%08lx", debugstr_w(face->StyleName), face->fs.fsCsb[0]);
             if(!face->scalable)
-                TRACE(" %ld", face->size.y_ppem >> 6);
+                TRACE(" %d", face->size.height);
             TRACE("\n");
 	}
     }
@@ -2440,12 +2440,12 @@ found:
             if(face->scalable)
                 break;
             if(height > 0)
-                newdiff = height - (signed int)(face->size.y_ppem >> 6);
+                newdiff = height - (signed int)(face->size.height);
             else
-                newdiff = -height - ((signed int)(face->size.y_ppem >> 6) - face->size.internal_leading);
+                newdiff = -height - ((signed int)(face->size.height) - face->size.internal_leading);
             if(!best || (diff > 0 && newdiff < diff && newdiff >= 0) ||
                (diff < 0 && newdiff > diff)) {
-                TRACE("%ld is better for %d diff was %d\n", face->size.y_ppem >> 6, height, diff);
+                TRACE("%d is better for %d diff was %d\n", face->size.height, height, diff);
                 diff = newdiff;
                 best = face;
                 if(diff == 0)
@@ -2464,12 +2464,12 @@ found:
                 if(face->scalable)
                     break;
                 if(height > 0)
-                    newdiff = height - (signed int)(face->size.y_ppem >> 6);
+                    newdiff = height - (signed int)(face->size.height);
                 else
-                    newdiff = -height - ((signed int)(face->size.y_ppem >> 6) - face->size.internal_leading);
+                    newdiff = -height - ((signed int)(face->size.height) - face->size.internal_leading);
                 if(!best || (diff > 0 && newdiff < diff && newdiff >= 0) ||
                    (diff < 0 && newdiff > diff)) {
-                    TRACE("%ld is better for %d diff was %d\n", face->size.y_ppem >> 6, height, diff);
+                    TRACE("%d is better for %d diff was %d\n", face->size.height, height, diff);
                     diff = newdiff;
                     best = face;
                     if(diff == 0)