Skip to content

W
wine-winehq
Commit 8f6f1c8f authored by Akihiro Sagawa's avatar Akihiro Sagawa Committed by Alexandre Julliard
Browse files
Options

gdi32: Move otmEMSquare initialization to freetype_load_font.

Signed-off-by: 's avatarAkihiro Sagawa <sagawa.aki@gmail.com> Signed-off-by: 's avatarHuw Davies <huw@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 67093e3b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
dlls/gdi32/freetype.c
View file @ 8f6f1c8f
......@@ -2496,6 +2496,7 @@ static BOOL CDECL freetype_load_font( struct gdi_font *font )
TRACE( "height %d => ppem %d\n", font->lf.lfHeight, font->ppem );
height = font->ppem;
font->ttc_item_offset = get_ttc_offset( ft_face, font->face_index );
font->otm.otmEMSquare = ft_face->units_per_EM;
}
else
{
......@@ -3946,7 +3947,6 @@ static BOOL CDECL freetype_set_outline_text_metrics( struct gdi_font *font )
font->otm.otmsCharSlopeRise = pHori->caret_Slope_Rise;
font->otm.otmsCharSlopeRun = pHori->caret_Slope_Run;
font->otm.otmItalicAngle = 0; /* POST table */
font->otm.otmEMSquare = ft_face->units_per_EM;
font->otm.otmAscent = SCALE_Y(pOS2->sTypoAscender);
font->otm.otmDescent = SCALE_Y(pOS2->sTypoDescender);
font->otm.otmLineGap = SCALE_Y(pOS2->sTypoLineGap);
......
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