From: Vadim Pisarevsky Date: Fri, 10 Jun 2011 06:53:34 +0000 (+0000) Subject: next attempt to fix ticket #1121 X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~7045 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0070ce20afd92b1b5019436705253994283466ee;p=platform%2Fupstream%2Fopencv.git next attempt to fix ticket #1121 --- diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp index 3b17d8e..26d77ef 100644 --- a/modules/core/src/stat.cpp +++ b/modules/core/src/stat.cpp @@ -885,7 +885,7 @@ normDiffInf_(const T* src1, const T* src2, const uchar* mask, ST* _result, int l { len *= cn; for( int i = 0; i < len; i++ ) - result = std::max(result, std::abs(src1[i] - src2[i])); + result = std::max(result, (ST)std::abs(src1[i] - src2[i])); } else { @@ -893,7 +893,7 @@ normDiffInf_(const T* src1, const T* src2, const uchar* mask, ST* _result, int l if( mask[i] ) { for( int k = 0; k < cn; k++ ) - result = std::max(result, std::abs(src1[k] - src2[k])); + result = std::max(result, (ST)std::abs(src1[k] - src2[k])); } } *_result = result;