[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.69,1.70

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24873

Modified Files:
	scaler.cpp 
Log Message:
Fix 64 bit compiler warning/error

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- scaler.cpp	14 May 2005 23:28:20 -0000	1.69
+++ scaler.cpp	23 Jun 2005 14:18:25 -0000	1.70
@@ -154,7 +154,7 @@
 							int width, int height) {
 	uint8 *r;
 
-	assert(((int)dstPtr & 3) == 0);
+	assert(((long)dstPtr & 3) == 0);
 	while (height--) {
 		r = dstPtr;
 		for (int i = 0; i < width; ++i, r += 4) {
@@ -179,7 +179,7 @@
 	const uint32 dstPitch2 = dstPitch * 2;
 	const uint32 dstPitch3 = dstPitch * 3;
 
-	assert(((int)dstPtr & 1) == 0);
+	assert(((long)dstPtr & 1) == 0);
 	while (height--) {
 		r = dstPtr;
 		for (int i = 0; i < width; ++i, r += 6) {
@@ -214,7 +214,7 @@
 	const uint32 dstPitch3 = dstPitch * 3;
 	const uint32 srcPitch2 = srcPitch * 2;
 
-	assert(((int)dstPtr & 1) == 0);
+	assert(((long)dstPtr & 1) == 0);
 	while (height > 0) {
 		r = dstPtr;
 		for (int i = 0; i < width; i += 2, r += 6) {