Dmitry Timoshkov : gdi32: Don't use pOS2->usWeightClass, some fonts don' t set it correctly.
Alexandre Julliard
julliard at winehq.org
Thu Sep 11 08:00:11 CDT 2008
Module: wine
Branch: master
Commit: 067cbc57f38db9b60f89dbff0e2b99054afa59c7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=067cbc57f38db9b60f89dbff0e2b99054afa59c7
Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date: Wed Sep 10 20:58:13 2008 +0900
gdi32: Don't use pOS2->usWeightClass, some fonts don't set it correctly.
---
dlls/gdi32/freetype.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 74e70ea..dcd60e3 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -5165,7 +5165,7 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize,
TM.tmAveCharWidth = 1;
}
TM.tmMaxCharWidth = (pFT_MulFix(ft_face->bbox.xMax - ft_face->bbox.xMin, x_scale) + 32) >> 6;
- TM.tmWeight = font->fake_bold ? FW_BOLD : pOS2->usWeightClass;
+ TM.tmWeight = (font->fake_bold || (ft_face->style_flags & FT_STYLE_FLAG_BOLD)) ? FW_BOLD : FW_REGULAR;
TM.tmOverhang = 0;
TM.tmDigitizedAspectX = 300;
TM.tmDigitizedAspectY = 300;
More information about the wine-cvs
mailing list