[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.103,1.104 bundle.cpp,1.38,1.39 bundle.h,1.15,1.16 debugger.cpp,1.46,1.47 debugger.h,1.22,1.23 gfx.cpp,2.114,2.115 imuse.cpp,2.46,2.47 imuse_digi.cpp,1.12,1.13 object.cpp,1.101,1.102 resource.cpp,1.83,1.84 script_v2.cpp,2.97,2.98 script_v5.cpp,1.92,1.93 script_v6.cpp,1.122,1.123 script_v8.cpp,2.163,2.164 scumm.h,1.207,1.208 scummvm.cpp,2.172,2.173 sound.cpp,1.118,1.119 sound.h,1.29,1.30 string.cpp,1.114,1.115 verbs.cpp,1.45,1.46
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.20,2.20.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.103,1.104 bundle.cpp,1.38,1.39 bundle.h,1.15,1.16 debugger.cpp,1.46,1.47 debugger.h,1.22,1.23 gfx.cpp,2.114,2.115 imuse.cpp,2.46,2.47 imuse_digi.cpp,1.12,1.13 object.cpp,1.101,1.102 resource.cpp,1.83,1.84 script_v2.cpp,2.97,2.98 script_v5.cpp,1.92,1.93 script_v6.cpp,1.122,1.123 script_v8.cpp,2.163,2.164 scumm.h,1.207,1.208 scummvm.cpp,2.172,2.173 sound.cpp,1.118,1.119 sound.h,1.29,1.30 string.cpp,1.114,1.115 verbs.cpp,1.45,1.46
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.20,2.20.2.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list