Merge pull request #2610 from ilya-lavrenov:ipp_cvtcolor

This commit is contained in:
Andrey Pavlenko
2014-04-14 18:52:06 +04:00
committed by OpenCV Buildbot
3 changed files with 241 additions and 7 deletions

View File

@@ -692,7 +692,7 @@ int cv::countNonZero( InputArray _src )
Mat src = _src.getMat();
#if defined HAVE_IPP && !defined HAVE_IPP_ICV_ONLY
#if defined HAVE_IPP && !defined HAVE_IPP_ICV_ONLY && 0
if (src.dims <= 2 || src.isContinuous())
{
IppiSize roiSize = { src.cols, src.rows };