diff options
| author | Tristan Matthews <tmatth@videolan.org> | 2016-08-09 15:54:55 +0300 |
|---|---|---|
| committer | Tristan Matthews <tmatth@videolan.org> | 2016-08-11 19:44:17 +0300 |
| commit | bc82a5341e5437d27557ba9244f7f2100b0ad7e1 (patch) | |
| tree | a54c130b38d115aceda7c98df2c7471288d277c4 | |
| parent | e5ea11d66ff1d32b306bbb7d0b393fce3c4f41cb (diff) | |
arch: fix inconsistent types in WORD2INT
| -rw-r--r-- | libspeexdsp/arch.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libspeexdsp/arch.h b/libspeexdsp/arch.h index c2de991..73a45a0 100644 --- a/libspeexdsp/arch.h +++ b/libspeexdsp/arch.h @@ -205,8 +205,8 @@ typedef float spx_word32_t; #define DIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b)) #define PDIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b)) -#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 : floor(.5+(x)))) - +#define WORD2INT(x) ((x) < -32767.5f ? -32768 : \ + ((x) > 32766.5f ? 32767 : (spx_int16_t)floor(.5 + (x)))) #endif |