Skip to content

W
wine-winehq
Commit 67d452d8 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

gdi32: Always initialize the em_scale variable.

parent 82c4fa35
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
dlls/gdi32/freetype.c
View file @ 67d452d8
...@@ -6386,11 +6386,12 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ...@@ -6386,11 +6386,12 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
/* metrics.width = min( metrics.width, ptm->tmMaxCharWidth << 6 ); */ /* 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)) { if(FT_IS_SCALABLE(incoming_font->ft_face)) {
TEXTMETRICW tm; TEXTMETRICW tm;
if (get_text_metrics(incoming_font, &tm) && if (get_text_metrics(incoming_font, &tm) &&
!(tm.tmPitchAndFamily & TMPF_FIXED_PITCH)) { !(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); avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, em_scale);
if (avgAdvance && if (avgAdvance &&
(metrics.horiAdvance+63) >> 6 == pFT_MulFix(incoming_font->ntmAvgWidth*2, em_scale)) (metrics.horiAdvance+63) >> 6 == pFT_MulFix(incoming_font->ntmAvgWidth*2, em_scale))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment