From c9ac2041e9895281186b287a03a9c818aa9fdd1f Mon Sep 17 00:00:00 2001 From: Pascal Massimino Date: Sat, 16 Aug 2014 00:15:29 -0700 Subject: [PATCH] fix some MSVC64 warning about float conversion (cherry picked from commit ee52dc4e549b0f13c86d2a34cfd9d6f96209f35c) Change-Id: I27ab27fc15033d27d0505729f6275fb542c8d473 --- src/enc/picture_csp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/enc/picture_csp.c b/src/enc/picture_csp.c index 05399861..4ccbabfc 100644 --- a/src/enc/picture_csp.c +++ b/src/enc/picture_csp.c @@ -208,7 +208,7 @@ static WEBP_INLINE float LinearToGammaF(float value) { const float x = v - (float)tab_pos; // fractional part const float v0 = kLinearToGammaTabF[tab_pos + 0]; const float v1 = kLinearToGammaTabF[tab_pos + 1]; - const float y = v1 * x + v0 * (1. - x); // interpolate + const float y = v1 * x + v0 * (1.f - x); // interpolate return y; } @@ -301,9 +301,9 @@ static WEBP_INLINE void UpdateChroma(const fixed_y_t* src1, const float g = ScaleDown(src1[1], src1[4], src2[1], src2[4]); const float b = ScaleDown(src1[2], src1[5], src2[2], src2[5]); const float W = RGBToGrayF(r, g, b); - dst[0] = (fixed_t)FixedYToW(r - W); - dst[1] = (fixed_t)FixedYToW(g - W); - dst[2] = (fixed_t)FixedYToW(b - W); + dst[0] = (fixed_t)FixedYToW((int)(r - W)); + dst[1] = (fixed_t)FixedYToW((int)(g - W)); + dst[2] = (fixed_t)FixedYToW((int)(b - W)); dst += 3; src1 += 6; src2 += 6;