[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.25,1.26

Max Horn fingolfin at users.sourceforge.net
Sun Jun 22 07:37:02 CEST 2003


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

Modified Files:
	scaler.cpp 
Log Message:
cleanup

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- scaler.cpp	22 Jun 2003 14:30:32 -0000	1.25
+++ scaler.cpp	22 Jun 2003 14:36:12 -0000	1.26
@@ -638,7 +638,7 @@
 }
 
 
-static inline uint32 interpolate5(uint16 A, uint16 B, int scale) {
+static inline uint16 interpolate5(uint16 A, uint16 B, int scale) {
 	uint16 r = (uint16)(((A & redMask) * scale + (B & redMask) * (5 - scale)) / 5);
 	uint16 g = (uint16)(((A & greenMask) * scale + (B & greenMask) * (5 - scale)) / 5);
 	uint16 b = (uint16)(((A & blueMask) * scale + (B & blueMask) * (5 - scale)) / 5);
@@ -650,7 +650,7 @@
 #if 1
 	// Accurate but slightly slower code
 	while (width--) {
-		*dst++ = (uint16)interpolate5(*srcA++, *srcB++, scale);
+		*dst++ = interpolate5(*srcA++, *srcB++, scale);
 	}
 #else
 	// Not fully accurate, but a bit faster





More information about the Scummvm-git-logs mailing list