From 91968941c84fed7489ba7c674e32b23e00d47928 Mon Sep 17 00:00:00 2001 From: cignoni Date: Sun, 18 Jan 2009 23:56:28 +0000 Subject: [PATCH] removed abs and sqrt ambiguities --- vcg/math/histogram.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vcg/math/histogram.h b/vcg/math/histogram.h index 651147e5..067736c2 100644 --- a/vcg/math/histogram.h +++ b/vcg/math/histogram.h @@ -92,6 +92,7 @@ Initial Release #include #include #include +#include namespace vcg { @@ -136,7 +137,7 @@ public: ScalarType RMS(){ DirtyCheck(); return rms;} //! Returns the variance of the data. - ScalarType Variance(){ return fabs(rms-avg*avg);} + ScalarType Variance(){ return math::Abs(rms-avg*avg);} //! Returns the standard deviation of the data. ScalarType StandardDeviation(){ return sqrt(Variance());} @@ -153,7 +154,7 @@ public: avg += double(*vi); rms += double(*vi)*double(*vi); } - rms = sqrt(rms/double(vec.size())); + rms = math::Sqrt(rms/double(vec.size())); avg = avg/double(vec.size()); dirty=false; }