[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.17,1.18

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv31302/common

Modified Files:
	scaler.cpp 
Log Message:
as Bertrand points out, using && introduces unnecessary branching, so & is better

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- scaler.cpp	25 May 2003 22:01:19 -0000	1.17
+++ scaler.cpp	25 May 2003 23:33:24 -0000	1.18
@@ -74,11 +74,11 @@
 	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] = {