[Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.12,1.13 codec37.cpp,1.19,1.20 codec47.cpp,1.49,1.50

Max Horn fingolfin at users.sourceforge.net
Wed May 21 11:17:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv8437

Modified Files:
	chunk.cpp codec37.cpp codec47.cpp 
Log Message:
yet more pedantic warning fixes

Index: chunk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- chunk.cpp	30 Apr 2003 11:26:35 -0000	1.12
+++ chunk.cpp	21 May 2003 18:16:01 -0000	1.13
@@ -150,7 +150,7 @@
 			_curPos = (uint32)delta;
 			break;
 		case seek_end:
-			if(delta > 0 || (_size + delta) < 0)
+			if(delta > 0 || _size < (uint32)-delta)
 				error("invalid seek request");
 
 			_curPos = (uint32)(_size + delta);
@@ -263,7 +263,7 @@
 			_curPos = (uint32)delta;
 			break;
 		case seek_end:
-			if(delta > 0 || (_size + delta) < 0) error("invalid seek request");
+			if(delta > 0 || _size < (uint32)-delta) error("invalid seek request");
 			_curPos = (uint32)(_size + delta);
 			break;
 	}

Index: codec37.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec37.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- codec37.cpp	30 Apr 2003 11:26:35 -0000	1.19
+++ codec37.cpp	21 May 2003 18:16:01 -0000	1.20
@@ -304,7 +304,7 @@
 	*(uint32 *)(dst) = v
 
 #define COPY_4X1_LINE(dst, src)			\
-	*(uint32 *)(dst) = *(uint32 *)(src)
+	*(uint32 *)(dst) = *(const uint32 *)(src)
 
 #endif /* SCUMM_NEED_ALIGNMENT */
 

Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- codec47.cpp	30 Apr 2003 11:34:05 -0000	1.49
+++ codec47.cpp	21 May 2003 18:16:01 -0000	1.50
@@ -44,10 +44,10 @@
 #else /* SCUMM_NEED_ALIGNMENT */
 
 #define COPY_4X1_LINE(dst, src)			\
-	*(uint32 *)(dst) = *(uint32 *)(src)
+	*(uint32 *)(dst) = *(const uint32 *)(src)
 
 #define COPY_2X1_LINE(dst, src)			\
-	*(uint16 *)(dst) = *(uint16 *)(src)
+	*(uint16 *)(dst) = *(const uint16 *)(src)
 
 #endif
 





More information about the Scummvm-git-logs mailing list