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>
This commit is contained in:
parent
67093e3b4a
commit
8f6f1c8f7a
|
@ -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 );
|
TRACE( "height %d => ppem %d\n", font->lf.lfHeight, font->ppem );
|
||||||
height = font->ppem;
|
height = font->ppem;
|
||||||
font->ttc_item_offset = get_ttc_offset( ft_face, font->face_index );
|
font->ttc_item_offset = get_ttc_offset( ft_face, font->face_index );
|
||||||
|
font->otm.otmEMSquare = ft_face->units_per_EM;
|
||||||
}
|
}
|
||||||
else
|
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.otmsCharSlopeRise = pHori->caret_Slope_Rise;
|
||||||
font->otm.otmsCharSlopeRun = pHori->caret_Slope_Run;
|
font->otm.otmsCharSlopeRun = pHori->caret_Slope_Run;
|
||||||
font->otm.otmItalicAngle = 0; /* POST table */
|
font->otm.otmItalicAngle = 0; /* POST table */
|
||||||
font->otm.otmEMSquare = ft_face->units_per_EM;
|
|
||||||
font->otm.otmAscent = SCALE_Y(pOS2->sTypoAscender);
|
font->otm.otmAscent = SCALE_Y(pOS2->sTypoAscender);
|
||||||
font->otm.otmDescent = SCALE_Y(pOS2->sTypoDescender);
|
font->otm.otmDescent = SCALE_Y(pOS2->sTypoDescender);
|
||||||
font->otm.otmLineGap = SCALE_Y(pOS2->sTypoLineGap);
|
font->otm.otmLineGap = SCALE_Y(pOS2->sTypoLineGap);
|
||||||
|
|
Loading…
Reference in New Issue