- make sure the code compiles with gcc 4.6

This commit is contained in:
Vincent Rabaud
2011-04-22 21:35:46 +00:00
parent 1e69bd5118
commit 6e15238dd9

View File

@@ -810,7 +810,7 @@ normInf_(const T* src, const uchar* mask, ST* _result, int len, int cn)
{ {
len *= cn; len *= cn;
for( int i = 0; i < len; i++ ) 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 else
{ {
@@ -818,7 +818,7 @@ normInf_(const T* src, const uchar* mask, ST* _result, int len, int cn)
if( mask[i] ) if( mask[i] )
{ {
for( int k = 0; k < cn; k++ ) 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; *_result = result;