[Scummvm-git-logs] scummvm master -> f9cd01fe0384dc3f59c7da3f5f2dc269a53a47e0

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f9cd01fe03 TITANIC: Compilation fix for audio buffer stream class


Commit: f9cd01fe0384dc3f59c7da3f5f2dc269a53a47e0
    https://github.com/scummvm/scummvm/commit/f9cd01fe0384dc3f59c7da3f5f2dc269a53a47e0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-02-10T21:34:15-05:00

Commit Message:
TITANIC: Compilation fix for audio buffer stream class

Changed paths:
    engines/titanic/sound/wave_file.cpp


diff --git a/engines/titanic/sound/wave_file.cpp b/engines/titanic/sound/wave_file.cpp
index 0d46dc0..76a09a5 100644
--- a/engines/titanic/sound/wave_file.cpp
+++ b/engines/titanic/sound/wave_file.cpp
@@ -48,7 +48,7 @@ public:
 };
 
 int AudioBufferStream::readBuffer(int16 *buffer, const int numSamples) {
-	int samplesToRead = MIN((const uint)numSamples, _audioBuffer->getBytesToRead() / sizeof(uint16));
+	int samplesToRead = MIN((const int)numSamples, (const int)(_audioBuffer->getBytesToRead() / sizeof(uint16)));
 	
 	const int16 *src = _audioBuffer->getReadPtr();
 	Common::copy(src, src + samplesToRead, buffer);