[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.19,1.20

Jamieson Christian jamieson630 at users.sourceforge.net
Tue Jun 10 22:09:06 CEST 2003


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

Modified Files:
	scaler.cpp 
Log Message:
Fixed MSVC warning

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- scaler.cpp	10 Jun 2003 16:25:49 -0000	1.19
+++ scaler.cpp	11 Jun 2003 05:08:41 -0000	1.20
@@ -198,10 +198,10 @@
 			else
 				product1a = color5;
 
-			*(dP + 0) = product1a;
-			*(dP + 1) = product1b;
-			*(dP + dstPitch/2 + 0) = product2a;
-			*(dP + dstPitch/2 + 1) = product2b;
+			*(dP + 0) = (uint16) product1a;
+			*(dP + 1) = (uint16) product1b;
+			*(dP + dstPitch/2 + 0) = (uint16) product2a;
+			*(dP + dstPitch/2 + 1) = (uint16) product2b;
 
 			bP += 1;
 			dP += 2;
@@ -303,10 +303,10 @@
 				product1b = Q_INTERPOLATE(color6, color6, color6, product1b);
 			}
 
-			*(dP + 0) = product1a;
-			*(dP + 1) = product1b;
-			*(dP + dstPitch/2 + 0) = product2a;
-			*(dP + dstPitch/2 + 1) = product2b;
+			*(dP + 0) = (uint16) product1a;
+			*(dP + 1) = (uint16) product1b;
+			*(dP + dstPitch/2 + 0) = (uint16) product2a;
+			*(dP + dstPitch/2 + 1) = (uint16) product2b;
 
 			bP += 1;
 			dP += 2;
@@ -440,10 +440,10 @@
 				}
 			}
 
-			*(dP + 0) = colorA;
-			*(dP + 1) = product;
-			*(dP + dstPitch/2 + 0) = product1;
-			*(dP + dstPitch/2 + 1) = product2;
+			*(dP + 0) = (uint16) colorA;
+			*(dP + 1) = (uint16) product;
+			*(dP + dstPitch/2 + 0) = (uint16) product1;
+			*(dP + dstPitch/2 + 1) = (uint16) product2;
 
 			bP += 1;
 			dP += 2;





More information about the Scummvm-git-logs mailing list