[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.29,1.30
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sun Jun 22 08:07:04 CEST 2003
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv14339
Modified Files:
scaler.cpp
Log Message:
fixed warning
Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- scaler.cpp 22 Jun 2003 14:59:21 -0000 1.29
+++ scaler.cpp 22 Jun 2003 15:06:48 -0000 1.30
@@ -655,7 +655,7 @@
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);
+ return (uint16)((r & redMask) | (g & greenMask) | (b & blueMask));
}
static inline void interpolate5Line(uint16 *dst, const uint16 *srcA, const uint16 *srcB, int scale, int width) {
More information about the Scummvm-git-logs
mailing list