Akihiro Sagawa : gdi32: Move otmEMSquare initialization to freetype_load_font.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: bc76df8934657bbc229112cb0eb572c91596b637
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=bc76df8934657bbc229112cb0...

Author: Akihiro Sagawa 
Date:   Tue Apr  6 21:34:19 2021 +0900

gdi32: Move otmEMSquare initialization to freetype_load_font.

Signed-off-by: Akihiro Sagawa 
Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard 
(cherry picked from commit 8f6f1c8f7aa2b848f0ebb15ec9e2b03854caf710)
Signed-off-by: Michael Stefaniuc

---

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 fffa3288503..d94643b4451 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -2489,6 +2489,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
     {
@@ -3952,7 +3953,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);