Module: wine Branch: master Commit: cd9db34e51d727f0166c23b970fa5e7e579903b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9db34e51d727f0166c23b970...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Sun Mar 19 22:59:44 2017 +0100
usp10: Pass const metrics to GPOS_convert_design_units_to_device().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Aric Stewart aric@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/usp10/opentype.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e531f3a..a1c4485 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -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)