projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1e69bd5
)
- make sure the code compiles with gcc 4.6
author
Vincent Rabaud
<no@email>
Fri, 22 Apr 2011 21:35:46 +0000
(21:35 +0000)
committer
Vincent Rabaud
<no@email>
Fri, 22 Apr 2011 21:35:46 +0000
(21:35 +0000)
modules/core/src/stat.cpp
patch
|
blob
|
history
diff --git
a/modules/core/src/stat.cpp
b/modules/core/src/stat.cpp
index
b35d1cf
..
e514d80
100644
(file)
--- 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;