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

[Pawel Kolodziejski]

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

Modified Files:
	scaler.cpp 
Log Message:
fixed warnings

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