Merge pull request #2686 from vbystricky:ippicv_integral

d9d9de75 · Alexander Alekhin · OpenCV Buildbot · 347d5b96 · c9103730 · d9d9de75
Commit d9d9de75 authored May 05, 2014 by Alexander Alekhin Committed by OpenCV Buildbot May 05, 2014
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sumpixels.cpp modules/imgproc/src/sumpixels.cpp +1 -1

No files found.
--- a/modules/imgproc/src/sumpixels.cpp
+++ b/modules/imgproc/src/sumpixels.cpp
@@ -364,7 +364,7 @@ void cv::integral( InputArray _src, OutputArray _sum, OutputArray _sqsum, Output
        sqsum = _sqsum.getMat();
    };

-#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
+#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7) && !defined HAVE_IPP_ICV_ONLY
    if( ( depth == CV_8U ) && ( sdepth == CV_32F || sdepth == CV_32S ) && ( !_tilted.needed() ) && ( !_sqsum.needed() || sqdepth == CV_64F ) && ( cn == 1 ) )
    {
        IppStatus status = ippStsErr;