From 8f6f1c8f7aa2b848f0ebb15ec9e2b03854caf710 Mon Sep 17 00:00:00 2001 From: Akihiro Sagawa Date: Tue, 6 Apr 2021 21:34:19 +0900 Subject: [PATCH] gdi32: Move otmEMSquare initialization to freetype_load_font. Signed-off-by: Akihiro Sagawa Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2535faad03a..c66db289ab1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -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); -- 2.11.4.GIT