[Scummvm-cvs-logs] scummvm master -> 724d7ef1018f2f0195c57da54f1b054787bbcaa7

[clone2727]

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:
724d7ef101 VIDEO: Use C++ versions of exp/ldexp


Commit: 724d7ef1018f2f0195c57da54f1b054787bbcaa7
    https://github.com/scummvm/scummvm/commit/724d7ef1018f2f0195c57da54f1b054787bbcaa7
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-07-19T04:35:40-07:00

Commit Message:
VIDEO: Use C++ versions of exp/ldexp

Should fix compilation on Mac PPC, and MinGW32 on buildbot

Changed paths:
    video/bink_decoder.cpp



diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index cebda72..226f81c 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;