From 511d09f5870b37efb898147410bb924132b13e87 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Fri, 22 Jun 2012 08:36:29 +0000 Subject: [PATCH] Fixed tests broken by r8708 --- modules/ts/src/ts_func.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ts/src/ts_func.cpp b/modules/ts/src/ts_func.cpp index 41f32e443f..fbbe8ecc6e 100644 --- a/modules/ts/src/ts_func.cpp +++ b/modules/ts/src/ts_func.cpp @@ -1129,26 +1129,26 @@ norm_(const _Tp* src, size_t total, int cn, int normType, double startval, const { if( !mask ) for( i = 0; i < total; i++ ) - result = std::max(result, (double)std::abs(int(src[i]))); + result = std::max(result, (double)std::abs(0+src[i]));// trick with 0 used to quiet gcc warning else for( int c = 0; c < cn; c++ ) { for( i = 0; i < total; i++ ) if( mask[i] ) - result = std::max(result, (double)std::abs(int(src[i*cn + c]))); + result = std::max(result, (double)std::abs(0+src[i*cn + c])); } } else if( normType == NORM_L1 ) { if( !mask ) for( i = 0; i < total; i++ ) - result += std::abs(int(src[i])); + result += std::abs(0+src[i]); else for( int c = 0; c < cn; c++ ) { for( i = 0; i < total; i++ ) if( mask[i] ) - result += std::abs(int(src[i*cn + c])); + result += std::abs(0+src[i*cn + c]); } } else