Skip to content

W
wine-winehq
Commit cd9db34e authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

usp10: Pass const metrics to GPOS_convert_design_units_to_device().

Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAric Stewart <aric@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6e216167
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
dlls/usp10/opentype.c
View file @ cd9db34e
......@@ -1579,15 +1579,16 @@ static VOID GPOS_get_anchor_values(LPCVOID table, LPPOINT pt, WORD ppem)
}
}
static void GPOS_convert_design_units_to_device(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, int desX, int desY, double *devX, double *devY)
static void GPOS_convert_design_units_to_device(const OUTLINETEXTMETRICW *otm, const LOGFONTW *logfont,
int desX, int desY, double *devX, double *devY)
{
int emHeight = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading;
int emHeight = otm->otmTextMetrics.tmAscent + otm->otmTextMetrics.tmDescent - otm->otmTextMetrics.tmInternalLeading;
TRACE("emHeight %i lfWidth %i\n",emHeight, lplogfont->lfWidth);
*devX = (desX * emHeight) / (double)lpotm->otmEMSquare;
*devY = (desY * emHeight) / (double)lpotm->otmEMSquare;
if (lplogfont->lfWidth)
FIXME("Font with lfWidth set not handled properly\n");
TRACE("emHeight %i lfWidth %i\n",emHeight, logfont->lfWidth);
*devX = (desX * emHeight) / (double)otm->otmEMSquare;
*devY = (desY * emHeight) / (double)otm->otmEMSquare;
if (logfont->lfWidth)
FIXME("Font with lfWidth set not handled properly.\n");
}
static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_ValueRecord *record)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment