From bca0b4b72977683794d441e57adc8c279ff4bfca Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Mon, 26 Aug 2024 14:25:35 +0200
Subject: [PATCH 1/4] use boolean compare instead of bitwise

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>

diff --git a/common/cudata.cpp b/common/cudata.cpp
index 19281de..d5b295f 100644
--- a/common/cudata.cpp
+++ b/common/cudata.cpp
@@ -73,7 +73,7 @@ inline bool isEqualRow(int addrA, int addrB)
 /* Check whether 2 addresses point to the same row or column */
 inline bool isEqualRowOrCol(int addrA, int addrB)
 {
-    return isEqualCol(addrA, addrB) | isEqualRow(addrA, addrB);
+    return isEqualCol(addrA, addrB) || isEqualRow(addrA, addrB);
 }
 
 /* Check whether one address points to the first column */

From da3eb3ea55be74e440b272e24d7d8e67cb7a76db Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Mon, 26 Aug 2024 14:44:55 +0200
Subject: [PATCH 2/4] fix variable shadowing

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>

diff --git a/common/cudata.h b/common/cudata.h
index 8397f05..7f132e6 100644
--- a/common/cudata.h
+++ b/common/cudata.h
@@ -48,7 +48,7 @@ enum PartSize
     SIZE_2NxnD, // asymmetric motion partition, 2Nx(3N/2) + 2Nx( N/2)
     SIZE_nLx2N, // asymmetric motion partition, ( N/2)x2N + (3N/2)x2N
     SIZE_nRx2N, // asymmetric motion partition, (3N/2)x2N + ( N/2)x2N
-    NUM_SIZES
+    PART_NUM_SIZES
 };
 
 enum PredMode