From 6e15238dd90f28727cc08cb51129f48e74ddc832 Mon Sep 17 00:00:00 2001 From: Vincent Rabaud Date: Fri, 22 Apr 2011 21:35:46 +0000 Subject: [PATCH] - make sure the code compiles with gcc 4.6 --- modules/core/src/stat.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp index b35d1cf..e514d80 100644 --- a/modules/core/src/stat.cpp +++ b/modules/core/src/stat.cpp @@ -810,7 +810,7 @@ normInf_(const T* src, const uchar* mask, ST* _result, int len, int cn) { len *= cn; for( int i = 0; i < len; i++ ) - result = std::max(result, std::abs(src[i])); + result = std::max(result, ST(std::abs(src[i]))); } else { @@ -818,7 +818,7 @@ normInf_(const T* src, const uchar* mask, ST* _result, int len, int cn) if( mask[i] ) { for( int k = 0; k < cn; k++ ) - result = std::max(result, std::abs(src[k])); + result = std::max(result, ST(std::abs(src[k]))); } } *_result = result; -- 2.7.4