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:
07e08f7
)
Fixed an overly-narrow assertion in cv::norm.
author
Roman Donchenko
<roman.donchenko@itseez.com>
Fri, 17 Jan 2014 10:49:42 +0000
(14:49 +0400)
committer
Roman Donchenko
<roman.donchenko@itseez.com>
Fri, 17 Jan 2014 10:49:42 +0000
(14:49 +0400)
size() requires that the matrix is two-dimensional, and norm()
works on higher dimensions.
modules/core/src/stat.cpp
patch
|
blob
|
history
diff --git
a/modules/core/src/stat.cpp
b/modules/core/src/stat.cpp
index
eac8239
..
0507162
100644
(file)
--- a/
modules/core/src/stat.cpp
+++ b/
modules/core/src/stat.cpp
@@
-2295,7
+2295,7
@@
static bool ocl_norm( InputArray _src1, InputArray _src2, int normType, double &
double cv::norm( InputArray _src1, InputArray _src2, int normType, InputArray _mask )
{
- CV_Assert( _src1.s
ize() == _src2.size(
) && _src1.type() == _src2.type() );
+ CV_Assert( _src1.s
ameSize(_src2
) && _src1.type() == _src2.type() );
double _result = 0;
if (ocl::useOpenCL() && _mask.empty() && _src1.isUMat() && _src2.isUMat() &&