| Message ID | 1306867221-13535-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
Am 31.05.2011 um 20:40 schrieb Peter Maydell: > From: Juha Riihimäki <juha.riihimaki@nokia.com> > > Fix an integer overflow that can happen for signed 32 bit types > when using FLOAT_MIXENG. (Note that at the moment this is only true > when using the MacOSX coreaudio audio driver.) > > Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com> > [Peter Maydell: Removed unnecessary casts] > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Tested-by: Andreas Färber <andreas.faerber@web.de> Silences the warnings for me. Thanks, Andreas > --- > v1->v2 : as suggested by Malc, removed one unnecessary cast > from each change. > > audio/mixeng_template.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/audio/mixeng_template.h b/audio/mixeng_template.h > index a2d0ef8..a38055c 100644 > --- a/audio/mixeng_template.h > +++ b/audio/mixeng_template.h > @@ -46,7 +46,7 @@ static mixeng_real inline glue (conv_, ET) (IN_T v) > #endif > #else /* !RECIPROCAL */ > #ifdef SIGNED > - return nv / (mixeng_real) (IN_MAX - IN_MIN); > + return nv / (mixeng_real) ((mixeng_real)IN_MAX - IN_MIN); > #else > return (nv - HALF) / (mixeng_real) IN_MAX; > #endif > @@ -63,7 +63,7 @@ static IN_T inline glue (clip_, ET) (mixeng_real v) > } > > #ifdef SIGNED > - return ENDIAN_CONVERT ((IN_T) (v * (IN_MAX - IN_MIN))); > + return ENDIAN_CONVERT ((IN_T) (v * ((mixeng_real)IN_MAX - > IN_MIN))); > #else > return ENDIAN_CONVERT ((IN_T) ((v * IN_MAX) + HALF)); > #endif > -- > 1.7.1 >
diff --git a/audio/mixeng_template.h b/audio/mixeng_template.h index a2d0ef8..a38055c 100644 --- a/audio/mixeng_template.h +++ b/audio/mixeng_template.h @@ -46,7 +46,7 @@ static mixeng_real inline glue (conv_, ET) (IN_T v) #endif #else /* !RECIPROCAL */ #ifdef SIGNED - return nv / (mixeng_real) (IN_MAX - IN_MIN); + return nv / (mixeng_real) ((mixeng_real)IN_MAX - IN_MIN); #else return (nv - HALF) / (mixeng_real) IN_MAX; #endif @@ -63,7 +63,7 @@ static IN_T inline glue (clip_, ET) (mixeng_real v) } #ifdef SIGNED - return ENDIAN_CONVERT ((IN_T) (v * (IN_MAX - IN_MIN))); + return ENDIAN_CONVERT ((IN_T) (v * ((mixeng_real)IN_MAX - IN_MIN))); #else return ENDIAN_CONVERT ((IN_T) ((v * IN_MAX) + HALF)); #endif