diff --git a/modules/ocl/doc/image_processing.rst b/modules/ocl/doc/image_processing.rst index 7dde475cc..100876a15 100644 --- a/modules/ocl/doc/image_processing.rst +++ b/modules/ocl/doc/image_processing.rst @@ -65,15 +65,15 @@ ocl::integral ----------------- Computes an integral image. -.. ocv:function:: void ocl::integral(const oclMat &src, oclMat &sum, oclMat &sqsum) +.. ocv:function:: void ocl::integral(const oclMat &src, oclMat &sum, oclMat &sqsum, int sdepth=-1) -.. ocv:function:: void ocl::integral(const oclMat &src, oclMat &sum) +.. ocv:function:: void ocl::integral(const oclMat &src, oclMat &sum, int sdepth=-1) :param src: Source image. Only ``CV_8UC1`` images are supported for now. - :param sum: Integral image containing 32-bit unsigned integer values packed into ``CV_32SC1`` . + :param sum: Integral image containing 32-bit unsigned integer or 32-bit floating-point . - :param sqsum: Sqsum values is ``CV_32FC1`` type. + :param sqsum: Sqsum values is ``CV_32FC1`` or ``CV_64FC1`` type. .. seealso:: :ocv:func:`integral` diff --git a/modules/ocl/src/imgproc.cpp b/modules/ocl/src/imgproc.cpp index 54df4d726..1e0560563 100644 --- a/modules/ocl/src/imgproc.cpp +++ b/modules/ocl/src/imgproc.cpp @@ -792,7 +792,6 @@ namespace cv return; } - int depth = src.depth(); if( sdepth <= 0 ) sdepth = CV_32S; sdepth = CV_MAT_DEPTH(sdepth);