From 0ebbfac41161d766572e000ff22a2f595e4d03d2 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 16 Dec 2019 19:37:11 +0000 Subject: [PATCH] compiler warning fix Signed-off-by: Ivailo Monev --- src/gui/text/qfontengine.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 6045ff487..835e38ae5 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -483,10 +483,10 @@ Q_GUI_EXPORT void qt_addBitmapToPath(qreal x0, qreal y0, const uchar *image_data // set up edges for (int y = 0; y <= h; ++y) { for (int x = 0; x <= w; ++x) { - bool topLeft = (x == 0)|(y == 0) ? false : SET(x - 1, y - 1); - bool topRight = (x == w)|(y == 0) ? false : SET(x, y - 1); - bool bottomLeft = (x == 0)|(y == h) ? false : SET(x - 1, y); - bool bottomRight = (x == w)|(y == h) ? false : SET(x, y); + bool topLeft = ((x == 0) && (y == 0)) ? false : SET(x - 1, y - 1); + bool topRight = ((x == w) && (y == 0)) ? false : SET(x, y - 1); + bool bottomLeft = ((x == 0) && (y == h)) ? false : SET(x - 1, y); + bool bottomRight = ((x == w) && (y == h)) ? false : SET(x, y); GRID(x, y) = 0; if ((!topRight) & bottomRight) -- 2.11.0