ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
(cherry picked from commit 8f6f1c8f7a)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
This commit is contained in:
Akihiro Sagawa 2021-04-06 21:34:19 +09:00 committed by Michael Stefaniuc
parent bdf3307a15
commit bc76df8934
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/gdi32/freetype.c
View File

@ -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);