[Scummvm-cvs-logs] SF.net SVN: scummvm:[42440] scummvm/trunk/engines/sword1/sound.cpp

buddha_ at users.sourceforge.net buddha_ at users.sourceforge.net
Mon Jul 13 19:09:40 CEST 2009


Revision: 42440
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42440&view=rev
Author:   buddha_
Date:     2009-07-13 17:09:40 +0000 (Mon, 13 Jul 2009)

Log Message:
-----------
Fix compilation under Windows (The fabs-calls were causing error C2668 about 'ambiguous call to overloaded function').

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/sound.cpp

Modified: scummvm/trunk/engines/sword1/sound.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sound.cpp	2009-07-13 16:52:09 UTC (rev 42439)
+++ scummvm/trunk/engines/sword1/sound.cpp	2009-07-13 17:09:40 UTC (rev 42440)
@@ -127,9 +127,9 @@
 				size /= 2;
 			int16 prev_be_value = (int16)SWAP_BYTES_16(*((uint16*)(data)));
 			for (uint32 i = 1 ; i < size ; ++i) {
-				le_diff_sum += fabs(data[i] - data[i-1]);
+				le_diff_sum += fabs((double)(data[i] - data[i-1]));
 				int16 be_value = (int16)SWAP_BYTES_16(*((uint16*)(data + i)));
-				be_diff_sum += fabs(be_value - prev_be_value);
+				be_diff_sum += fabs((double)(be_value - prev_be_value));
 				prev_be_value = be_value;
 			}
 			delete [] data;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list