[Scummvm-cvs-logs] CVS: scummvm/sound audiostream.cpp,1.31,1.32

Chris Apers chrilith at users.sourceforge.net
Wed Aug 6 04:54:04 CEST 2003


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv3698

Modified Files:
	audiostream.cpp 
Log Message:
Fixed type mismatch error compiling palmos port

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- audiostream.cpp	5 Aug 2003 18:17:26 -0000	1.31
+++ audiostream.cpp	6 Aug 2003 11:53:18 -0000	1.32
@@ -79,7 +79,7 @@
 int LinearMemoryStream<stereo, is16Bit, isUnsigned>::readBuffer(int16 *buffer, int numSamples) {
 	int samples = 0;
 	while (samples < numSamples && !eosIntern()) {
-		const int len = MIN(numSamples, (_end - _ptr) / (is16Bit ? 2 : 1));
+		const int len = MIN(numSamples, (int)(_end - _ptr) / (is16Bit ? 2 : 1));
 		while (samples < len) {
 			*buffer++ = readSample<is16Bit, isUnsigned>(_ptr);
 			_ptr += (is16Bit ? 2 : 1);
@@ -152,7 +152,7 @@
 	int samples = 0;
 	while (samples < numSamples && !eosIntern()) {
 		const byte *endMarker = (_pos > _end) ? _bufferEnd : _end;
-		const int len = MIN(numSamples, (endMarker - _pos) / (is16Bit ? 2 : 1));
+		const int len = MIN(numSamples, (int)(endMarker - _pos) / (is16Bit ? 2 : 1));
 		while (samples < len) {
 			*buffer++ = readSample<is16Bit, isUnsigned>(_pos);
 			_pos += (is16Bit ? 2 : 1);





More information about the Scummvm-git-logs mailing list