aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Hoops2011-07-19 07:35:40 -0400
committerMatthew Hoops2011-07-19 07:35:40 -0400
commit724d7ef1018f2f0195c57da54f1b054787bbcaa7 (patch)
tree81af95639058edd59f6bf0090d6cbc722113d49c
parent540d0260e65677848a9f9ef53460ab2c7d0bf6d0 (diff)
downloadscummvm-rg350-724d7ef1018f2f0195c57da54f1b054787bbcaa7.tar.gz
scummvm-rg350-724d7ef1018f2f0195c57da54f1b054787bbcaa7.tar.bz2
scummvm-rg350-724d7ef1018f2f0195c57da54f1b054787bbcaa7.zip
VIDEO: Use C++ versions of exp/ldexp
Should fix compilation on Mac PPC, and MinGW32 on buildbot
-rw-r--r--video/bink_decoder.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index cebda72a76..226f81c0c6 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -1404,7 +1404,7 @@ void BinkDecoder::readResidue(VideoFrame &video, int16 *block, int masksCount) {
float BinkDecoder::getFloat(AudioTrack &audio) {
int power = audio.bits->getBits(5);
- float f = ldexpf(audio.bits->getBits(23), power - 23);
+ float f = ldexp((float)audio.bits->getBits(23), power - 23);
if (audio.bits->getBit())
f = -f;
@@ -1478,8 +1478,8 @@ void BinkDecoder::readAudioCoeffs(AudioTrack &audio, float *coeffs) {
for (uint32 i = 0; i < audio.bandCount; i++) {
int value = audio.bits->getBits(8);
- // 0.066399999 / log10(M_E)
- quant[i] = expf(MIN(value, 95) * 0.15289164787221953823f) * audio.root;
+ // 0.066399999 / log10(M_E)
+ quant[i] = exp(MIN(value, 95) * 0.15289164787221953823f) * audio.root;
}
float q = 0.0;