From 610e258cc5a9f8093c5d3708d8da8c81ab50bd96 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Fri, 7 Aug 2015 18:24:21 -0700 Subject: [PATCH] Make the round() replacement match C99 and POSIX. http://pubs.opengroup.org/onlinepubs/009695399/functions/round.html Change-Id: Idf387d944d36bf593f8797db9053e11e5c9b9b39 --- vp9/common/vp9_systemdependent.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vp9/common/vp9_systemdependent.h b/vp9/common/vp9_systemdependent.h index fc77762de..3c5062f85 100644 --- a/vp9/common/vp9_systemdependent.h +++ b/vp9/common/vp9_systemdependent.h @@ -35,11 +35,11 @@ void vpx_reset_mmx_state(void); #if defined(_MSC_VER) && _MSC_VER < 1800 // round is not defined in MSVC before VS2013. -static INLINE int round(double x) { +static INLINE double round(double x) { if (x < 0) - return (int)ceil(x - 0.5); + return ceil(x - 0.5); else - return (int)floor(x + 0.5); + return floor(x + 0.5); } #endif -- 2.50.0