[Scummvm-cvs-logs] CVS: scummvm/smush codec47.cpp,1.2,1.3 imuse_channel.cpp,1.2,1.3 saud_channel.cpp,1.2,1.3

Max Horn fingolfin at users.sourceforge.net
Sat Aug 24 14:58:16 CEST 2002


Update of /cvsroot/scummvm/scummvm/smush
In directory usw-pr-cvs1:/tmp/cvs-serv19830/smush

Modified Files:
	codec47.cpp imuse_channel.cpp saud_channel.cpp 
Log Message:
fixed warnings

Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/smush/codec47.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- codec47.cpp	24 Aug 2002 17:12:31 -0000	1.2
+++ codec47.cpp	24 Aug 2002 21:57:00 -0000	1.3
@@ -28,7 +28,7 @@
 }
 
 bool DumpDecoder::decode(Blitter & dst, Chunk & src) {
-	int n = 0, i = 0;
+	int i = 0;
 	int seq = src.getWord();
 	int codec = src.getByte();
 	int flags = src.getByte();

Index: imuse_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/smush/imuse_channel.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- imuse_channel.cpp	24 Aug 2002 17:12:31 -0000	1.2
+++ imuse_channel.cpp	24 Aug 2002 21:57:00 -0000	1.3
@@ -193,10 +193,10 @@
 }
 
 bool ImuseChannel::handleSubTags(int & offset) {
-	int available_size = _tbufferSize - offset;
-	if(available_size >= 8) {
+	if(_tbufferSize - offset >= 8) {
 		Chunk::type type = READ_BE_UINT32(_tbuffer + offset);
 		unsigned int size = READ_BE_UINT32(_tbuffer + offset + 4);
+		unsigned int available_size = _tbufferSize - offset;
 		switch(type) {
 			case TYPE_MAP_: 
 				_inData = false;

Index: saud_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/smush/saud_channel.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- saud_channel.cpp	24 Aug 2002 17:12:31 -0000	1.2
+++ saud_channel.cpp	24 Aug 2002 21:57:00 -0000	1.3
@@ -47,10 +47,10 @@
 }
 
 bool SaudChannel::handleSubTags(int & offset) {
-	int available_size = _tbufferSize - offset;
-	if(available_size >= 8) {
+	if(_tbufferSize - offset >= 8) {
 		Chunk::type type = READ_BE_UINT32(_tbuffer + offset);
 		unsigned int size = READ_BE_UINT32(_tbuffer + offset + 4);
+		unsigned int available_size = _tbufferSize - offset;
 
 		switch(type) {
 			case TYPE_STRK:
@@ -166,14 +166,14 @@
 			_track(track), 
 			_nbframes(0),
 			_dataSize(-1),
-			_tbuffer(0), 
-			_sbuffer(0), 
 			_frequency(freq),
-			_tbufferSize(0), 
-			_sbufferSize(0), 
 			_inData(false),
-			_markReached(false)
-			{
+			_markReached(false),
+			_tbuffer(0),
+			_tbufferSize(0),
+			_sbuffer(0),
+			_sbufferSize(0)
+{
 }
 
 SaudChannel::~SaudChannel() {





More information about the Scummvm-git-logs mailing list