From 4689dfb21fac8b34132e72fbc7d0059f4ac4cb53 Mon Sep 17 00:00:00 2001 From: Herman Semenov Date: Sat, 7 Jun 2025 09:38:31 +0300 Subject: [PATCH] mi: fix missing braces for expected logical condition 'if-else if' Without missing braces, logical behavior 'if-else if' block works as two 'if' independent blocks. --- mi/mipushpxl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mi/mipushpxl.c b/mi/mipushpxl.c index ea8f8ae44e..5eb625e09c 100644 --- a/mi/mipushpxl.c +++ b/mi/mipushpxl.c @@ -104,11 +104,12 @@ miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, #if 1 MiBits startmask; - if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) + if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) { if (screenInfo.bitmapBitOrder == LSBFirst) startmask = (MiBits) (-1) ^ LONG2CHARSSAMEORDER((MiBits) (-1) << 1); else startmask = (MiBits) (-1) ^ LONG2CHARSSAMEORDER((MiBits) (-1) >> 1); + } else if (screenInfo.bitmapBitOrder == LSBFirst) startmask = (MiBits) (-1) ^ LONG2CHARSDIFFORDER((MiBits) (-1) << 1); else @@ -163,13 +164,14 @@ miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, } #if 1 /* This is not quite right, but it'll do for now */ - if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) + if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) { if (screenInfo.bitmapBitOrder == LSBFirst) msk = LONG2CHARSSAMEORDER(LONG2CHARSSAMEORDER(msk) << 1); else msk = LONG2CHARSSAMEORDER(LONG2CHARSSAMEORDER(msk) >> 1); + } else if (screenInfo.bitmapBitOrder == LSBFirst) msk = LONG2CHARSDIFFORDER(LONG2CHARSDIFFORDER(msk) << 1); else @@ -213,13 +215,14 @@ miPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, } #if 1 /* This is not quite right, but it'll do for now */ - if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) + if (screenInfo.bitmapBitOrder == IMAGE_BYTE_ORDER) { if (screenInfo.bitmapBitOrder == LSBFirst) msk = LONG2CHARSSAMEORDER(LONG2CHARSSAMEORDER(msk) << 1); else msk = LONG2CHARSSAMEORDER(LONG2CHARSSAMEORDER(msk) >> 1); + } else if (screenInfo.bitmapBitOrder == LSBFirst) msk = LONG2CHARSDIFFORDER(LONG2CHARSDIFFORDER(msk) << 1); else