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

size() requires that the matrix is two-dimensional, and norm()
works on higher dimensions.
pull/2160/head
Roman Donchenko 11 years ago
parent 07e08f7a3d
commit e9805e444f
  1. 2
      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 ) 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() &&

Loading…
Cancel
Save