cv::magnitude

This commit is contained in:
Ilya Lavrenov
2014-04-04 14:18:53 +04:00
parent bf860dbb31
commit ed1ca00bf6
2 changed files with 13 additions and 0 deletions

View File

@@ -2016,6 +2016,7 @@ double cv::norm( InputArray _src, int normType, InputArray _mask )
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
size_t total_size = src.total();
int rows = src.size[0], cols = (int)(total_size/rows);
if( (src.dims == 2 || (src.isContinuous() && mask.isContinuous()))
&& cols > 0 && (size_t)rows*cols == total_size
&& (normType == NORM_INF || normType == NORM_L1 ||