[Scummvm-cvs-logs] SF.net SVN: scummvm:[55699] scummvm/trunk/graphics/jpeg.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue Feb 1 00:19:00 CET 2011


Revision: 55699
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55699&view=rev
Author:   thebluegr
Date:     2011-01-31 23:19:00 +0000 (Mon, 31 Jan 2011)

Log Message:
-----------
Silenced some MSVC warnings

Modified Paths:
--------------
    scummvm/trunk/graphics/jpeg.cpp

Modified: scummvm/trunk/graphics/jpeg.cpp
===================================================================
--- scummvm/trunk/graphics/jpeg.cpp	2011-01-31 23:10:18 UTC (rev 55698)
+++ scummvm/trunk/graphics/jpeg.cpp	2011-01-31 23:19:00 UTC (rev 55699)
@@ -49,7 +49,7 @@
 	53, 60, 61, 54, 47, 55, 62, 63
 };
 
-static const float _cosine32[32] = {
+static const double _cosine32[32] = {
 	 1.000000000000000,  0.980785280403230,  0.923879532511287,  0.831469612302545,
 	 0.707106781186548,  0.555570233019602,  0.382683432365090,  0.195090322016128,
 	 0.000000000000000, -0.195090322016128, -0.382683432365090, -0.555570233019602,
@@ -513,10 +513,10 @@
 	float ret = (float)weight * _cosine32[vx_in] * _cosine32[vy_in];
 
 	if (fx == 0)
-		ret /= M_SQRT2;
+		ret /= (float)M_SQRT2;
 
 	if (fy == 0)
-		ret /= M_SQRT2;
+		ret /= (float)M_SQRT2;
 
 	return ret;
 }


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