From f33f066b196230b5c397a5cea18792bef7a9f573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net>
Date: Thu, 20 May 2021 04:29:45 -0400
Subject: [PATCH] Digitalman and Clang agree that order of operations is too
hard to reply on. Make it harder to merge this code from upstream in the
future instead.
---
src/conio/xbr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/conio/xbr.c b/src/conio/xbr.c
index 60331c2b7d..62eb0c131d 100644
--- a/src/conio/xbr.c
+++ b/src/conio/xbr.c
@@ -74,8 +74,8 @@ static uint32_t pixel_diff(uint32_t x, uint32_t y)
const unsigned i = df(PH,PD) + df(PH,I5) + df(PF,I4) + df(PF,PB) + (df(PE,PI)<<2); \
if (e <= i) { \
const unsigned px = df(PE,PF) <= df(PE,PH) ? PF : PH; \
- if (e < i && (!eq(PF,PB) && !eq(PH,PD) || eq(PE,PI) \
- && (!eq(PF,I4) && !eq(PH,I5)) \
+ if ((e < i) && ((!eq(PF,PB) && !eq(PH,PD)) || (eq(PE,PI) \
+ && (!eq(PF,I4) && !eq(PH,I5))) \
|| eq(PE,PG) || eq(PE,PC))) { \
const unsigned ke = df(PF,PG); \
const unsigned ki = df(PH,PC); \
--
GitLab