Commit 511d09f5 authored by Andrey Kamaev's avatar Andrey Kamaev

Fixed tests broken by r8708

parent 2984fa75
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment