From 3d0be7e25c850c519a034cfe1630a359f8cbab3d Mon Sep 17 00:00:00 2001 From: wowzaman12 Date: Mon, 6 Apr 2015 17:33:32 +0000 Subject: [PATCH] Fix an operator precedence issue clang complained about. git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1310 a31d4220-a93d-0410-bf67-fe4944624d44 --- src/wx/gfxviewers.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/wx/gfxviewers.cpp b/src/wx/gfxviewers.cpp index 34ce55ab..ae18a8b8 100644 --- a/src/wx/gfxviewers.cpp +++ b/src/wx/gfxviewers.cpp @@ -1182,10 +1182,11 @@ namespace Viewers { cd = new wxColourData(); *cd = dlg.GetColourData(); wxColour c = cd->GetColour(); + //Binary or the upper 5 bits of each color choice customBackdropColor = - (c.Red() >> 3) + - (c.Green() >> 3) << 5 + - (c.Blue() >> 3) << 10; + (c.Red() >> 3) || + ((c.Green() >> 3) << 5) || + ((c.Blue() >> 3) << 10); } else // kind of an unintuitive way to turn it off... customBackdropColor = -1;