aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2011-01-31 23:19:00 +0000
committerFilippos Karapetis2011-01-31 23:19:00 +0000
commitc0ce8a839e20a2bcce6009aef492e5959d9c6b5f (patch)
treed27de771daa34ae0fdf81043b42da3d47b448f4a
parente2d3521d7daf3a7f4caa994ada46a777b800f875 (diff)
downloadscummvm-rg350-c0ce8a839e20a2bcce6009aef492e5959d9c6b5f.tar.gz
scummvm-rg350-c0ce8a839e20a2bcce6009aef492e5959d9c6b5f.tar.bz2
scummvm-rg350-c0ce8a839e20a2bcce6009aef492e5959d9c6b5f.zip
Silenced some MSVC warnings
svn-id: r55699
-rw-r--r--graphics/jpeg.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/jpeg.cpp b/graphics/jpeg.cpp
index f918229bdd..2b202f32b5 100644
--- a/graphics/jpeg.cpp
+++ b/graphics/jpeg.cpp
@@ -49,7 +49,7 @@ static const uint8 _zigZagOrder[64] = {
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 JPEG::idct(int x, int y, int weight, int fx, int fy) {
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;
}