ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
wowzaman12 2015-04-06 17:33:32 +00:00
parent 1ab4b86c94
commit 3d0be7e25c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wx/gfxviewers.cpp
View File

@ -1182,10 +1182,11 @@ namespace Viewers {
cd = new wxColourData(); cd = new wxColourData();
*cd = dlg.GetColourData(); *cd = dlg.GetColourData();
wxColour c = cd->GetColour(); wxColour c = cd->GetColour();
//Binary or the upper 5 bits of each color choice
customBackdropColor = customBackdropColor =
(c.Red() >> 3) + (c.Red() >> 3) ||
(c.Green() >> 3) << 5 + ((c.Green() >> 3) << 5) ||
(c.Blue() >> 3) << 10; ((c.Blue() >> 3) << 10);
} else } else
// kind of an unintuitive way to turn it off... // kind of an unintuitive way to turn it off...
customBackdropColor = -1; customBackdropColor = -1;