Module: wine Branch: master Commit: 67d452d8acd8394aa475bf90ed346e3a03925b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d452d8acd8394aa475bf90ed...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Oct 21 17:08:49 2013 +0200
gdi32: Always initialize the em_scale variable.
---
dlls/gdi32/freetype.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 69779b8..b39f2ed 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6386,11 +6386,12 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, /* metrics.width = min( metrics.width, ptm->tmMaxCharWidth << 6 ); */ }
+ em_scale = MulDiv(incoming_font->ppem, 1 << 16, incoming_font->ft_face->units_per_EM); + if(FT_IS_SCALABLE(incoming_font->ft_face)) { TEXTMETRICW tm; if (get_text_metrics(incoming_font, &tm) && !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH)) { - em_scale = MulDiv(incoming_font->ppem, 1 << 16, incoming_font->ft_face->units_per_EM); avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, em_scale); if (avgAdvance && (metrics.horiAdvance+63) >> 6 == pFT_MulFix(incoming_font->ntmAvgWidth*2, em_scale))