Module: wine Branch: master Commit: 92a74a82711ad15372f951addb3f525b593a26de URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a74a82711ad15372f951addb... Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jan 9 21:58:00 2008 +0800 gdi32: Fix the regression caused by the scaling font metrics patch. --- dlls/gdi32/freetype.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 480b8e5..2de49d4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3125,13 +3125,15 @@ found: TRACE("Chosen: %s %s (%s/%p:%ld)\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName), face->file, face->font_data_ptr, face->face_index); - ret->ppem = height; - ret->aveWidth = abs(lf.lfWidth); - ret->scale_x = 0.0; ret->scale_y = 0.0; + ret->aveWidth = abs(lf.lfWidth); + if(!face->scalable) { + ret->ppem = face->size.height; + if (height != 0) ret->ppem += diff; + width = face->size.x_ppem >> 6; height = face->size.y_ppem >> 6; }