diff options
| author | Max Horn | 2003-05-25 23:33:24 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-25 23:33:24 +0000 |
| commit | c5ea0839ef3672f92c088ab3db9853eeebd88fa3 (patch) | |
| tree | 714b0b8200376fec3afe3a4cd90c75b255e0633f | |
| parent | 910bdb5068e010dc12daeb13a5b2829e44a37d62 (diff) | |
| download | scummvm-rg350-c5ea0839ef3672f92c088ab3db9853eeebd88fa3.tar.gz scummvm-rg350-c5ea0839ef3672f92c088ab3db9853eeebd88fa3.tar.bz2 scummvm-rg350-c5ea0839ef3672f92c088ab3db9853eeebd88fa3.zip | |
as Bertrand points out, using && introduces unnecessary branching, so & is better
svn-id: r7979
| -rw-r--r-- | common/scaler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/scaler.cpp b/common/scaler.cpp index a00c85dce9..0eb811fb3c 100644 --- a/common/scaler.cpp +++ b/common/scaler.cpp @@ -74,11 +74,11 @@ static inline int GetResult(uint32 A, uint32 B, uint32 C, uint32 D) { const bool ac = (A==C); const bool bc = (B==C); const int x1 = ac; - const int y1 = (bc && !ac); + const int y1 = (bc & !ac); const bool ad = (A==D); const bool bd = (B==D); const int x2 = ad; - const int y2 = (bd && !ad); + const int y2 = (bd & !ad); const int x = x1+x2; const int y = y1+y2; static const int rmap[3][3] = { |