ipp: some functions are not available in the ICV package
This commit is contained in:
parent
1461ab41bc
commit
0d477ffea1
@ -300,7 +300,7 @@ static ippiReorderFunc ippiSwapChannelsC3RTab[] =
|
|||||||
0, (ippiReorderFunc)ippiSwapChannels_32f_C3R, 0, 0
|
0, (ippiReorderFunc)ippiSwapChannels_32f_C3R, 0, 0
|
||||||
};
|
};
|
||||||
|
|
||||||
#if IPP_VERSION_X100 >= 801
|
#if !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 801
|
||||||
static ippiReorderFunc ippiSwapChannelsC4RTab[] =
|
static ippiReorderFunc ippiSwapChannelsC4RTab[] =
|
||||||
{
|
{
|
||||||
(ippiReorderFunc)ippiSwapChannels_8u_C4R, 0, (ippiReorderFunc)ippiSwapChannels_16u_C4R, 0,
|
(ippiReorderFunc)ippiSwapChannels_8u_C4R, 0, (ippiReorderFunc)ippiSwapChannels_16u_C4R, 0,
|
||||||
@ -3280,7 +3280,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
|
|||||||
if( CvtColorIPPLoopCopy(src, dst, IPPReorderFunctor(ippiSwapChannelsC3RTab[depth], 2, 1, 0)) )
|
if( CvtColorIPPLoopCopy(src, dst, IPPReorderFunctor(ippiSwapChannelsC3RTab[depth], 2, 1, 0)) )
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#if (IPP_VERSION_X100 >= 801)
|
#if !defined(HAVE_IPP_ICV_ONLY) && (IPP_VERSION_X100 >= 801)
|
||||||
else if( code == CV_RGBA2BGRA )
|
else if( code == CV_RGBA2BGRA )
|
||||||
{
|
{
|
||||||
if( CvtColorIPPLoopCopy(src, dst, IPPReorderFunctor(ippiSwapChannelsC4RTab[depth], 2, 1, 0)) )
|
if( CvtColorIPPLoopCopy(src, dst, IPPReorderFunctor(ippiSwapChannelsC4RTab[depth], 2, 1, 0)) )
|
||||||
|
@ -233,6 +233,9 @@ static bool IPPDerivScharr(const Mat& src, Mat& dst, int ddepth, int dx, int dy,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case CV_32F:
|
case CV_32F:
|
||||||
|
#if defined(HAVE_IPP_ICV_ONLY) // N/A: ippiMulC_32f_C1R
|
||||||
|
return false;
|
||||||
|
#else
|
||||||
{
|
{
|
||||||
switch(dst.type())
|
switch(dst.type())
|
||||||
{
|
{
|
||||||
@ -277,6 +280,7 @@ static bool IPPDerivScharr(const Mat& src, Mat& dst, int ddepth, int dx, int dy,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -341,6 +345,9 @@ static bool IPPDeriv(const Mat& src, Mat& dst, int ddepth, int dx, int dy, int k
|
|||||||
|
|
||||||
if (src.type() == CV_32F && dst.type() == CV_32F)
|
if (src.type() == CV_32F && dst.type() == CV_32F)
|
||||||
{
|
{
|
||||||
|
#if defined(HAVE_IPP_ICV_ONLY) // N/A: ippiMulC_32f_C1R
|
||||||
|
return false;
|
||||||
|
#else
|
||||||
#if 0
|
#if 0
|
||||||
if ((dx == 1) && (dy == 0))
|
if ((dx == 1) && (dy == 0))
|
||||||
{
|
{
|
||||||
@ -411,6 +418,7 @@ static bool IPPDeriv(const Mat& src, Mat& dst, int ddepth, int dx, int dy, int k
|
|||||||
ippiMulC_32f_C1R((Ipp32f *)dst.data, (int)dst.step, (Ipp32f)scale, (Ipp32f *)dst.data, (int)dst.step, ippiSize(dst.cols*dst.channels(), dst.rows));
|
ippiMulC_32f_C1R((Ipp32f *)dst.data, (int)dst.step, (Ipp32f)scale, (Ipp32f *)dst.data, (int)dst.step, ippiSize(dst.cols*dst.channels(), dst.rows));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1912,7 +1912,7 @@ static int computeResizeAreaTab( int ssize, int dsize, int cn, double scale, Dec
|
|||||||
getBufferSizeFunc = (ippiResizeGetBufferSize)ippiResizeGetBufferSize_##TYPE;\
|
getBufferSizeFunc = (ippiResizeGetBufferSize)ippiResizeGetBufferSize_##TYPE;\
|
||||||
getSrcOffsetFunc = (ippiResizeGetSrcOffset)ippiResizeGetSrcOffset_##TYPE;
|
getSrcOffsetFunc = (ippiResizeGetSrcOffset)ippiResizeGetSrcOffset_##TYPE;
|
||||||
|
|
||||||
#if IPP_VERSION_X100 >= 701
|
#if !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 701
|
||||||
class IPPresizeInvoker :
|
class IPPresizeInvoker :
|
||||||
public ParallelLoopBody
|
public ParallelLoopBody
|
||||||
{
|
{
|
||||||
@ -2384,7 +2384,7 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize,
|
|||||||
double scale_x = 1./inv_scale_x, scale_y = 1./inv_scale_y;
|
double scale_x = 1./inv_scale_x, scale_y = 1./inv_scale_y;
|
||||||
int k, sx, sy, dx, dy;
|
int k, sx, sy, dx, dy;
|
||||||
|
|
||||||
#if IPP_VERSION_X100 >= 701
|
#if !defined(HAVE_IPP_ICV_ONLY) && IPP_VERSION_X100 >= 701
|
||||||
#define IPP_RESIZE_EPS 1.e-10
|
#define IPP_RESIZE_EPS 1.e-10
|
||||||
|
|
||||||
double ex = fabs((double)dsize.width/src.cols - inv_scale_x)/inv_scale_x;
|
double ex = fabs((double)dsize.width/src.cols - inv_scale_x)/inv_scale_x;
|
||||||
|
@ -1228,6 +1228,9 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
#if defined(HAVE_IPP_ICV_ONLY) // N/A: ippiFilterMin*/ippiFilterMax*
|
||||||
|
return false;
|
||||||
|
#else
|
||||||
IppiPoint point = {anchor.x, anchor.y};
|
IppiPoint point = {anchor.x, anchor.y};
|
||||||
|
|
||||||
#define IPP_MORPH_CASE(cvtype, flavor, data_type) \
|
#define IPP_MORPH_CASE(cvtype, flavor, data_type) \
|
||||||
@ -1257,6 +1260,7 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
|
|||||||
}
|
}
|
||||||
|
|
||||||
#undef IPP_MORPH_CASE
|
#undef IPP_MORPH_CASE
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user