gdi32: Move otmEMSquare initialization to freetype_load_font.

Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Move otmEMSquare initialization to freetype_load_font.
8f6f1c8f · Akihiro Sagawa · Alexandre Julliard · 67093e3b · 8f6f1c8f
Commit 8f6f1c8f authored Apr 06, 2021 by Akihiro Sagawa Committed by Alexandre Julliard Apr 07, 2021
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

freetype.c dlls/gdi32/freetype.c +1 -1

No files found.
--- 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);