[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.23,1.24

[Max Horn]

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

Modified Files:
	scaler.cpp 
Log Message:
no need to keep these regression tests: the changes are mathematically and operationally (read: taking into account side effects and special cases in computer arithmetics) equivalent to the old code

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- scaler.cpp	22 Jun 2003 11:55:39 -0000	1.23
+++ scaler.cpp	22 Jun 2003 12:03:24 -0000	1.24
@@ -97,8 +97,6 @@
 
 static inline uint32 INTERPOLATE(uint32 A, uint32 B) {
 	if (A != B) {	
-		// Non regression test
-		assert ((((A & colorMask) + (B & colorMask)) >> 1) + (A & B & lowPixelMask)==(((A & colorMask) >> 1) + ((B & colorMask) >> 1) + (A & B & lowPixelMask)));
 		return (((A & colorMask) + (B & colorMask)) >> 1) + (A & B & lowPixelMask);
 	} else
 		return A;
@@ -106,8 +104,6 @@
 
 static inline uint32 Q_INTERPOLATE(uint32 A, uint32 B, uint32 C, uint32 D) {
 	register uint32 x = ((A & qcolorMask) + (B & qcolorMask) + (C & qcolorMask) + (D & qcolorMask))>>2;
-	// Non regression test
-	assert (x==((A & qcolorMask) >> 2) + ((B & qcolorMask) >> 2) + ((C & qcolorMask) >> 2) + ((D & qcolorMask) >> 2));
 	register uint32 y = (A & qlowpixelMask) + (B & qlowpixelMask) + (C & qlowpixelMask) + (D & qlowpixelMask);
 
 	y = (y >> 2) & qlowpixelMask;