potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Outdated ICV restrictions were removed;

Browse Source
This commit is contained in:
Pavel Vlasov
2016-08-17 10:25:19 +03:00
parent 93e5947f55
commit 680ca88ce0
13 changed files with 16 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/imgwarp.cpp
+2 -2
View File
@@ -4740,7 +4740,7 @@ static bool ocl_logPolar(InputArray _src, OutputArray _dst,
}
#endif
#if defined HAVE_IPP && !defined HAVE_IPP_ICV_ONLY && IPP_DISABLE_BLOCK
#if defined HAVE_IPP && IPP_DISABLE_BLOCK
typedef IppStatus (CV_STDCALL * ippiRemap)(const void * pSrc, IppiSize srcSize, int srcStep, IppiRect srcRoi,
const Ipp32f* pxMap, int xMapStep, const Ipp32f* pyMap, int yMapStep,
@@ -4848,7 +4848,7 @@ void cv::remap( InputArray _src, OutputArray _dst,
int type = src.type(), depth = CV_MAT_DEPTH(type);
#if defined HAVE_IPP && !defined HAVE_IPP_ICV_ONLY && IPP_DISABLE_BLOCK
#if defined HAVE_IPP && IPP_DISABLE_BLOCK
CV_IPP_CHECK()
{
if ((interpolation == INTER_LINEAR || interpolation == INTER_CUBIC || interpolation == INTER_NEAREST) &&