[Scummvm-cvs-logs] SF.net SVN: scummvm: [20831] scummvm/trunk/sound/softsynth/mt32/tables.cpp

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Thu Feb 23 10:12:07 CET 2006


Revision: 20831
Author:   aquadran
Date:     2006-02-23 10:11:22 -0800 (Thu, 23 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20831&view=rev

Log Message:
-----------
fixed warnings for msvc7

Modified Paths:
--------------
    scummvm/trunk/sound/softsynth/mt32/tables.cpp
Modified: scummvm/trunk/sound/softsynth/mt32/tables.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32/tables.cpp	2006-02-23 17:56:54 UTC (rev 20830)
+++ scummvm/trunk/sound/softsynth/mt32/tables.cpp	2006-02-23 18:11:22 UTC (rev 20831)
@@ -171,7 +171,7 @@
 		if (elf == 0) {
 			envDeltaMaxTime[lf] = 63;
 		} else {
-			float cap = 11.0f * log(elf) + 64;
+			float cap = 11.0f * (float)log(elf) + 64;
 			if (cap > 100.0f) {
 				cap = 100.0f;
 			}
@@ -335,7 +335,7 @@
 				tlf = (float)lf - padjtable[depti];
 				if (tlf < 0)
 					tlf = 0;
-				lfp = exp(0.713619942f * tlf) / 407.4945111f;
+				lfp = (float)exp(0.713619942f * tlf) / 407.4945111f;
 
 				if (depat < 50)
 					finalval = 4096.0f * powf(2, -lfp);
@@ -410,7 +410,7 @@
 				//amplog = pow(1.431817011, filval) / FLOAT_PI;
 				amplog = powf(1.531817011f, filval) / FLOAT_PI;
 				dval = (128.0f - (float)distval) / 128.0f;
-				amplog = exp(amplog);
+				amplog = (float)exp(amplog);
 				dval = powf(amplog,dval)/amplog;
 				if (lf < 8) {
 					tvfBiasMult[lf][distval] = (int)(dval * 256.0f);







More information about the Scummvm-git-logs mailing list