From: Koen Vos Date: Tue, 31 Jan 2012 19:49:40 +0000 (-0500) Subject: Fixes MSVC warnings X-Git-Tag: v0.9.9~2 X-Git-Url: http://git.xiph.org/?p=opus.git;a=commitdiff_plain;h=75f04e5eb16770e9508a486ee58b7b0910aa8cf0 Fixes MSVC warnings --- diff --git a/silk/float/SigProc_FLP.h b/silk/float/SigProc_FLP.h index 7c7601f..8b5a1fa 100644 --- a/silk/float/SigProc_FLP.h +++ b/silk/float/SigProc_FLP.h @@ -162,7 +162,7 @@ static inline silk_float silk_sigmoid( silk_float x ) } /* floating-point to integer conversion (rounding) */ -static inline opus_int32 silk_float2int( double x ) +static inline opus_int32 silk_float2int( silk_float x ) { return (opus_int32)float2int( x ); } @@ -176,8 +176,7 @@ static inline void silk_float2short_array( { opus_int32 k; for( k = length - 1; k >= 0; k-- ) { - double x = in[k]; - out[k] = silk_SAT16( (opus_int32)float2int( x ) ); + out[k] = silk_SAT16( (opus_int32)float2int( in[k] ) ); } }