aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Apers2003-08-06 11:53:18 +0000
committerChris Apers2003-08-06 11:53:18 +0000
commit1a0d308e041d563e4fa4cfa57392ea0e306fe92f (patch)
tree9e48fd92909689780e2a2a952e460473e9464f71
parent7e2ff83e70e8c003c875c9ddd728ff9770dce92b (diff)
downloadscummvm-rg350-1a0d308e041d563e4fa4cfa57392ea0e306fe92f.tar.gz
scummvm-rg350-1a0d308e041d563e4fa4cfa57392ea0e306fe92f.tar.bz2
scummvm-rg350-1a0d308e041d563e4fa4cfa57392ea0e306fe92f.zip
Fixed type mismatch error compiling palmos port
svn-id: r9552
-rw-r--r--sound/audiostream.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index 3c2405a0b9..270a36e5db 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -79,7 +79,7 @@ template<bool stereo, bool is16Bit, bool isUnsigned>
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 WrappedMemoryStream<stereo, is16Bit, isUnsigned>::readBuffer(int16 *buffer,
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);