From 8414c6518f0fffd2f90ae29c8c9e80d99eb98349 Mon Sep 17 00:00:00 2001
From: Maksim Shabunin <maksim.shabunin@itseez.com>
Date: Sat, 20 Feb 2016 12:29:23 +0300
Subject: [PATCH] Fixed build with older ippicv

---
 modules/imgproc/src/filter.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/imgproc/src/filter.cpp b/modules/imgproc/src/filter.cpp
index d9beb69753..c09818580f 100644
--- a/modules/imgproc/src/filter.cpp
+++ b/modules/imgproc/src/filter.cpp
@@ -4575,7 +4575,7 @@ struct ReplacementFilter : public HalFilterImpl
 };
 
 #ifdef HAVE_IPP
-
+#if !HAVE_ICV
 typedef IppStatus(CV_STDCALL* ippiFilterBorder)(
     const void* pSrc, int srcStep, void* pDst, int dstStep,
     IppiSize dstRoiSize, IppiBorderType border, const void* borderValue,
@@ -4735,7 +4735,7 @@ struct IppFilter : public HalFilterImpl
         }
     }
 };
-
+#endif
 #endif
 
 struct DftFilter : public HalFilterImpl
@@ -4952,6 +4952,7 @@ void init_filter2d(FilterContext& c,
     }
 
 #ifdef HAVE_IPP
+#if !HAVE_ICV
     if (kernel_type == CV_32FC1) {
         IppFilter<CV_32F>* impl = new IppFilter<CV_32F>();
         if (impl->init(kernel_data, kernel_step, kernel_type, kernel_width, kernel_height,
@@ -4975,6 +4976,7 @@ void init_filter2d(FilterContext& c,
         }
         delete impl;
     }
+#endif
 #endif
 
     if (DftFilter::isAppropriate(stype, dtype, kernel_width, kernel_height))