potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Fix for pullrequest comment

Browse Source
This commit is contained in:
vbystricky
2014-04-07 17:06:02 +04:00
parent 2d54581971
commit 7badc85b60
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/color.cpp
+2 -2
View File
@@ -298,7 +298,7 @@ static ippiReorderFunc ippiSwapChannelsC3RTab[] =
0, (ippiReorderFunc)ippiSwapChannels_32f_C3R, 0, 0
};
#if ((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8)
#if (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
static ippiReorderFunc ippiSwapChannelsC4RTab[] =
{
(ippiReorderFunc)ippiSwapChannels_8u_C4R, 0, (ippiReorderFunc)ippiSwapChannels_16u_C4R, 0,
@@ -3254,7 +3254,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
if( CvtColorIPPLoopCopy(src, dst, IPPReorderFunctor(ippiSwapChannelsC3RTab[depth], 2, 1, 0)) )
return;
}
#if ((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8)
#if (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
else if( code == CV_RGBA2BGRA )
{
if( CvtColorIPPLoopCopy(src, dst, IPPReorderFunctor(ippiSwapChannelsC4RTab[depth], 2, 1, 0)) )
modules/imgproc/src/morph.cpp
+2 -2
View File
@@ -1136,7 +1136,7 @@ private:
Scalar borderValue;
};
#if defined (HAVE_IPP) && (((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8))
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kernel,
const Size& ksize, const Point &anchor, bool rectKernel)
{
@@ -1459,7 +1459,7 @@ static void morphOp( int op, InputArray _src, OutputArray _dst,
Size ksize = kernel.data ? kernel.size() : Size(3,3);
anchor = normalizeAnchor(anchor, ksize);
#if defined (HAVE_IPP) && (((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8))
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
if( IPPMorphOp(op, _src, _dst, kernel, anchor, iterations, borderType, borderValue) )
return;
#endif
modules/imgproc/src/smooth.cpp
+1 -1
View File
@@ -1109,7 +1109,7 @@ void cv::GaussianBlur( InputArray _src, OutputArray _dst, Size ksize,
return;
#endif
#if defined (HAVE_IPP) && (((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8))
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
if( type == CV_32FC1 && sigma1 == sigma2 && ksize.width == ksize.height && sigma1 != 0.0 )
{
Mat src = _src.getMat(), dst = _dst.getMat();