mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2597 from ilya-lavrenov:ipp_countnonzero

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-04-11 12:43:24 +04:00 committed by OpenCV Buildbot
commit 7ae547a208
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -680,7 +680,8 @@ static bool ocl_countNonZero( InputArray _src, int & res )
int cv::countNonZero( InputArray _src )
{
CV_Assert( _src.channels() == 1 );
int type = _src.type(), cn = CV_MAT_CN(type);
CV_Assert( cn == 1 );
#ifdef HAVE_OPENCL
int res = -1;
@ -690,8 +691,33 @@ int cv::countNonZero( InputArray _src )
#endif
Mat src = _src.getMat();
CountNonZeroFunc func = getCountNonZeroTab(src.depth());
#if defined HAVE_IPP && !defined HAVE_IPP_ICV_ONLY
if (src.dims <= 2 || src.isContinuous())
{
IppiSize roiSize = { src.cols, src.rows };
Ipp32s count, srcstep = (Ipp32s)src.step;
IppStatus status = (IppStatus)-1;
if (src.isContinuous())
{
roiSize.width = (Ipp32s)src.total();
roiSize.height = 1;
srcstep = (Ipp32s)src.total() * CV_ELEM_SIZE(type);
}
int depth = CV_MAT_DEPTH(type);
if (depth == CV_8U)
status = ippiCountInRange_8u_C1R((const Ipp8u *)src.data, srcstep, roiSize, &count, 0, 0);
else if (depth == CV_32F)
status = ippiCountInRange_32f_C1R((const Ipp32f *)src.data, srcstep, roiSize, &count, 0, 0);
if (status >= 0)
return (Ipp32s)src.total() - count;
}
#endif
CountNonZeroFunc func = getCountNonZeroTab(src.depth());
CV_Assert( func != 0 );
const Mat* arrays[] = {&src, 0};