From d0ae40415228871c68fc9cebe6a7f9ef0f476082 Mon Sep 17 00:00:00 2001 From: nick black Date: Tue, 9 Jan 2024 22:14:49 -0500 Subject: [PATCH] channels_blend(): bow to clang14 -Wbitwise-instead-of-logical overlords --- src/lib/internal.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/lib/internal.h b/src/lib/internal.h index cb6174128..168d3f1a9 100644 --- a/src/lib/internal.h +++ b/src/lib/internal.h @@ -1358,9 +1358,7 @@ channels_blend(notcurses* nc, unsigned c1, unsigned c2, unsigned* blends, } }else if(ncchannel_default_p(c1) && ncchannel_default_p(c2)){ // do nothing, leave as default - // intentional bitwise AND on the first condition, to eliminate the - // dependency due to C's short-circuit evaluation - }else if((ncchannel_palindex_p(c1) & ncchannel_palindex_p(c2)) && + }else if((ncchannel_palindex_p(c1) && ncchannel_palindex_p(c2)) && ncchannel_palindex(c1) == ncchannel_palindex(c2)){ // do nothing, leave as palette }else{