Commit 8414c651 authored by Maksim Shabunin's avatar Maksim Shabunin

Fixed build with older ippicv

parent 27abd4d3
...@@ -4575,7 +4575,7 @@ struct ReplacementFilter : public HalFilterImpl ...@@ -4575,7 +4575,7 @@ struct ReplacementFilter : public HalFilterImpl
}; };
#ifdef HAVE_IPP #ifdef HAVE_IPP
#if !HAVE_ICV
typedef IppStatus(CV_STDCALL* ippiFilterBorder)( typedef IppStatus(CV_STDCALL* ippiFilterBorder)(
const void* pSrc, int srcStep, void* pDst, int dstStep, const void* pSrc, int srcStep, void* pDst, int dstStep,
IppiSize dstRoiSize, IppiBorderType border, const void* borderValue, IppiSize dstRoiSize, IppiBorderType border, const void* borderValue,
...@@ -4735,7 +4735,7 @@ struct IppFilter : public HalFilterImpl ...@@ -4735,7 +4735,7 @@ struct IppFilter : public HalFilterImpl
} }
} }
}; };
#endif
#endif #endif
struct DftFilter : public HalFilterImpl struct DftFilter : public HalFilterImpl
...@@ -4952,6 +4952,7 @@ void init_filter2d(FilterContext& c, ...@@ -4952,6 +4952,7 @@ void init_filter2d(FilterContext& c,
} }
#ifdef HAVE_IPP #ifdef HAVE_IPP
#if !HAVE_ICV
if (kernel_type == CV_32FC1) { if (kernel_type == CV_32FC1) {
IppFilter<CV_32F>* impl = new IppFilter<CV_32F>(); IppFilter<CV_32F>* impl = new IppFilter<CV_32F>();
if (impl->init(kernel_data, kernel_step, kernel_type, kernel_width, kernel_height, if (impl->init(kernel_data, kernel_step, kernel_type, kernel_width, kernel_height,
...@@ -4975,6 +4976,7 @@ void init_filter2d(FilterContext& c, ...@@ -4975,6 +4976,7 @@ void init_filter2d(FilterContext& c,
} }
delete impl; delete impl;
} }
#endif
#endif #endif
if (DftFilter::isAppropriate(stype, dtype, kernel_width, kernel_height)) if (DftFilter::isAppropriate(stype, dtype, kernel_width, kernel_height))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment