fixed warning

2014-04-14 14:39:46 +04:00
parent ad7f2311c0
commit 884b706b3a
6 changed files with 11 additions and 7 deletions
--- a/modules/imgproc/src/deriv.cpp
+++ b/modules/imgproc/src/deriv.cpp
@@ -607,6 +607,7 @@ void cv::Laplacian( InputArray _src, OutputArray _dst, int ddepth, int ksize,
        } \
    } while ((void)0, 0)

+            CV_SUPPRESS_DEPRECATED_START
            if (sdepth == CV_8U && ddepth == CV_16S && !floatScale && !floatDelta)
            {
                IPP_FILTER_LAPLACIAN(Ipp8u, Ipp16s, 8u16s);
@@ -625,6 +626,7 @@ void cv::Laplacian( InputArray _src, OutputArray _dst, int ddepth, int ksize,
                if (needDelta && status >= 0)
                    status = ippiAddC_32f_C1IR((Ipp32f)delta, (Ipp32f *)dst.data, (int)dst.step, roisize);
            }
+            CV_SUPPRESS_DEPRECATED_END

            if (status >= 0)
                return;