From 2b27f7dbb33a2b84632a5bd2838783ba12281720 Mon Sep 17 00:00:00 2001
From: Pavel Vlasov <pavel.vlasov@intel.com>
Date: Tue, 1 Dec 2015 16:10:29 +0300
Subject: [PATCH] Fixed warnings for IPP9+ build;

---
 modules/imgproc/src/filter.cpp           | 4 ++--
 modules/imgproc/src/hough.cpp            | 4 ++--
 modules/imgproc/test/test_houghLines.cpp | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/imgproc/src/filter.cpp b/modules/imgproc/src/filter.cpp
index f78296cedb..f70389b07a 100644
--- a/modules/imgproc/src/filter.cpp
+++ b/modules/imgproc/src/filter.cpp
@@ -4624,7 +4624,7 @@ static bool ipp_filter2D( InputArray _src, OutputArray _dst, int ddepth,
                     IppAutoBuffer<Ipp32f> kerTmp;
                     int kerStep = sizeof(Ipp32f)*kernelSize.width;
 #if IPP_VERSION_X100 >= 900
-                    if(kernel.step != kerStep)
+                    if((int)kernel.step != kerStep)
                     {
                         kerTmp.Alloc(kerStep*kernelSize.height);
                         if(ippiCopy_32f_C1R((Ipp32f*)kernel.data, (int)kernel.step, kerTmp, kerStep, kernelSize) < 0)
@@ -4651,7 +4651,7 @@ static bool ipp_filter2D( InputArray _src, OutputArray _dst, int ddepth,
                     IppAutoBuffer<Ipp16s> kerTmp;
                     int kerStep = sizeof(Ipp16s)*kernelSize.width;
 #if IPP_VERSION_X100 >= 900
-                    if(kernel.step != kerStep)
+                    if((int)kernel.step != kerStep)
                     {
                         kerTmp.Alloc(kerStep*kernelSize.height);
                         if(ippiCopy_16s_C1R((Ipp16s*)kernel.data, (int)kernel.step, kerTmp, kerStep, kernelSize) < 0)
diff --git a/modules/imgproc/src/hough.cpp b/modules/imgproc/src/hough.cpp
index ae3eef946c..e77544e902 100644
--- a/modules/imgproc/src/hough.cpp
+++ b/modules/imgproc/src/hough.cpp
@@ -96,7 +96,7 @@ HoughLinesStandard( const Mat& img, float rho, float theta,
     int numangle = cvRound((max_theta - min_theta) / theta);
     int numrho = cvRound(((width + height) * 2 + 1) / rho);
 
-#if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLED_BLOCK
+#if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLE_BLOCK
     CV_IPP_CHECK()
     {
         IppiSize srcSize = { width, height };
@@ -429,7 +429,7 @@ HoughLinesProbabilistic( Mat& image,
     int numangle = cvRound(CV_PI / theta);
     int numrho = cvRound(((width + height) * 2 + 1) / rho);
 
-#if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLED_BLOCK
+#if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLE_BLOCK
     CV_IPP_CHECK()
     {
         IppiSize srcSize = { width, height };
diff --git a/modules/imgproc/test/test_houghLines.cpp b/modules/imgproc/test/test_houghLines.cpp
index cf6dc87d95..a508841714 100644
--- a/modules/imgproc/test/test_houghLines.cpp
+++ b/modules/imgproc/test/test_houghLines.cpp
@@ -189,7 +189,7 @@ void BaseHoughLineTest::run_test(int type)
     else if (type == PROBABILISTIC)
         count = countMatIntersection<Vec4i>(exp_lines, lines, 1e-4f, 0.f);
 
-#if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLED_BLOCK
+#if defined HAVE_IPP && !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 810 && IPP_DISABLE_BLOCK
     EXPECT_GE( count, (int) (exp_lines.total() * 0.8) );
 #else
     EXPECT_EQ( count, (int) exp_lines.total());