generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed build with older ippicv

Browse Source
This commit is contained in:
Maksim Shabunin 2016-02-20 12:29:23 +03:00
parent 27abd4d3a3
commit 8414c6518f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgproc/src/filter.cpp
View File

@ -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
} }
} }
}; };
#endif
#endif #endif
struct DftFilter : public HalFilterImpl struct DftFilter : public HalFilterImpl
@ -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,
} }
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))