From dae1f8d716d85febace2ac81332e6f19d2637443 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Tue, 24 Dec 2019 13:48:33 +0900 Subject: [PATCH] [WIN32SS][FREETYPE][NTGDI] Clarify calculation precedence for '&' and '?' --- win32ss/gdi/ntgdi/freetype.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 7ddf52fca1f..2a019dd70f8 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -3411,7 +3411,7 @@ static unsigned int get_native_glyph_outline(FT_Outline *outline, unsigned int b while (point <= outline->contours[contour]) { ppc = (TTPOLYCURVE *)(buf + needed); - type = outline->tags[point] & FT_Curve_Tag_On ? + type = (outline->tags[point] & FT_Curve_Tag_On) ? TT_PRIM_LINE : TT_PRIM_QSPLINE; cpfx = 0; do @@ -3494,7 +3494,7 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b while (point <= outline->contours[contour]) { ppc = (TTPOLYCURVE *)(buf + needed); - type = outline->tags[point] & FT_Curve_Tag_On ? + type = (outline->tags[point] & FT_Curve_Tag_On) ? TT_PRIM_LINE : TT_PRIM_CSPLINE; cpfx = 0; do @@ -6175,7 +6175,7 @@ IntExtTextOutW( /* * Process the horizontal alignment and modify XStart accordingly. */ - DxShift = fuOptions & ETO_PDY ? 1 : 0; + DxShift = (fuOptions & ETO_PDY) ? 1 : 0; if (pdcattr->flTextAlign & (TA_RIGHT | TA_CENTER)) { ULONGLONG TextWidth = 0; @@ -6768,7 +6768,7 @@ NtGdiExtTextOutW( if (UnsafeDx) { /* If ETO_PDY is specified, we have pairs of INTs */ - DxSize = (Count * sizeof(INT)) * (fuOptions & ETO_PDY ? 2 : 1); + DxSize = (Count * sizeof(INT)) * ((fuOptions & ETO_PDY) ? 2 : 1); BufSize += DxSize; }