potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Fixed multidimensional count non-zero IPP implementation

Browse Source
This commit is contained in:
Maksim Shabunin
2017-05-23 11:43:19 +03:00
parent 0e60b26513
commit f23b6ba652
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/stat.cpp
+7 -7
View File
@@ -1333,23 +1333,23 @@ static bool ipp_countNonZero( Mat &src, int &res )
{
IppStatus status;
const Mat *arrays[] = {&src, NULL};
uchar *ptrs[1] = {NULL};
NAryMatIterator it(arrays, ptrs);
Mat planes[1];
NAryMatIterator it(arrays, planes, 1);
IppiSize size = {(int)it.size*src.channels(), 1};
res = 0;
for (size_t i = 0; i < it.nplanes; i++, ++it)
{
if(depth == CV_8U)
status = CV_INSTRUMENT_FUN_IPP(ippiCountInRange_8u_C1R, (const Ipp8u *)src.ptr(), (int)src.step, size, &count, 0, 0);
status = CV_INSTRUMENT_FUN_IPP(ippiCountInRange_8u_C1R, it.planes->ptr<Ipp8u>(), (int)it.planes->step, size, &count, 0, 0);
else if(depth == CV_32F)
status = CV_INSTRUMENT_FUN_IPP(ippiCountInRange_32f_C1R, (const Ipp32f *)src.ptr(), (int)src.step, size, &count, 0, 0);
status = CV_INSTRUMENT_FUN_IPP(ippiCountInRange_32f_C1R, it.planes->ptr<Ipp32f>(), (int)it.planes->step, size, &count, 0, 0);
else
return false;
if(status < 0)
if(status < 0 || (int)it.planes->total()*src.channels() < count)
return false;
res += (size.width*size.height - count);
res += (int)it.planes->total()*src.channels() - count;
}
}