generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed an overly-narrow assertion in cv::norm.

Browse Source 
size() requires that the matrix is two-dimensional, and norm()
works on higher dimensions.
This commit is contained in:
Roman Donchenko
2014-01-17 14:49:42 +04:00
parent 07e08f7a3d
commit e9805e444f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/stat.cpp
View File

@@ -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 ) double cv::norm( InputArray _src1, InputArray _src2, int normType, InputArray _mask )
{ {
CV_Assert( _src1.size() == _src2.size() && _src1.type() == _src2.type() ); CV_Assert( _src1.sameSize(_src2) && _src1.type() == _src2.type() );
double _result = 0; double _result = 0;
if (ocl::useOpenCL() && _mask.empty() && _src1.isUMat() && _src2.isUMat() && if (ocl::useOpenCL() && _mask.empty() && _src1.isUMat() && _src2.isUMat() &&