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

fixed

Browse Source
This commit is contained in:
Elena Gvozdeva 2014-04-21 15:20:59 +04:00
parent b4830d896c
commit 3d7872b904
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/imgproc/src/distransform.cpp
View File

@ -689,10 +689,11 @@ static void distanceTransform_L1_8U(InputArray _src, OutputArray _dst)
Mat dst = _dst.getMat(); Mat dst = _dst.getMat();
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7) && !defined HAVE_IPP_ICV_ONLY #if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7) && !defined HAVE_IPP_ICV_ONLY
IppiSize roi = { src.cols, src.rows }; IppiSize roi = { src.cols, src.rows };
Ipp32s pMetrics[2] = { 1, 2 }; //L1, 3x3 mask Ipp32s pMetrics[2] = { 1, 2 }; //L1, 3x3 mask
if (ippiDistanceTransform_3x3_8u_C1R(src.ptr<uchar>(), (int)src.step, dst.ptr<uchar>(), (int)dst.step, roi, pMetrics)>=0) if (ippiDistanceTransform_3x3_8u_C1R(src.ptr<uchar>(), (int)src.step, dst.ptr<uchar>(), (int)dst.step, roi, pMetrics)>=0)
return; return;
setIppErrorStatus();
#endif #endif
distanceATS_L1_8u(src, dst); distanceATS_L1_8u(src, dst);
@ -734,7 +735,7 @@ void cv::distanceTransform( InputArray _src, OutputArray _dst, OutputArray _labe
{ {
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7) #if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
if ((currentParallelFramework()==NULL) || (src.total()<(int)(1<<16))) if ((currentParallelFramework()==NULL) || (src.total()<(int)(1<<14)))
{ {
IppStatus status; IppStatus status;
IppiSize roi = { src.cols, src.rows }; IppiSize roi = { src.cols, src.rows };
@ -749,6 +750,7 @@ void cv::distanceTransform( InputArray _src, OutputArray _dst, OutputArray _labe
ippsFree( pBuffer ); ippsFree( pBuffer );
if (status>=0) if (status>=0)
return; return;
setIppErrorStatus();
} }
} }
#endif #endif
@ -775,6 +777,7 @@ void cv::distanceTransform( InputArray _src, OutputArray _dst, OutputArray _labe
IppiSize roi = { src.cols, src.rows }; IppiSize roi = { src.cols, src.rows };
if (ippiDistanceTransform_3x3_8u32f_C1R(src.ptr<uchar>(), (int)src.step, dst.ptr<float>(), (int)dst.step, roi, _mask)>=0) if (ippiDistanceTransform_3x3_8u32f_C1R(src.ptr<uchar>(), (int)src.step, dst.ptr<float>(), (int)dst.step, roi, _mask)>=0)
return; return;
setIppErrorStatus();
#endif #endif
distanceTransform_3x3(src, temp, dst, _mask); distanceTransform_3x3(src, temp, dst, _mask);
@ -785,6 +788,7 @@ void cv::distanceTransform( InputArray _src, OutputArray _dst, OutputArray _labe
IppiSize roi = { src.cols, src.rows }; IppiSize roi = { src.cols, src.rows };
if (ippiDistanceTransform_5x5_8u32f_C1R(src.ptr<uchar>(), (int)src.step, dst.ptr<float>(), (int)dst.step, roi, _mask)>=0) if (ippiDistanceTransform_5x5_8u32f_C1R(src.ptr<uchar>(), (int)src.step, dst.ptr<float>(), (int)dst.step, roi, _mask)>=0)
return; return;
setIppErrorStatus();
#endif #endif
distanceTransform_5x5(src, temp, dst, _mask); distanceTransform_5x5(src, temp, dst, _mask);
@ -796,7 +800,7 @@ void cv::distanceTransform( InputArray _src, OutputArray _dst, OutputArray _labe
if( labelType == CV_DIST_LABEL_CCOMP ) if( labelType == CV_DIST_LABEL_CCOMP )
{ {
#endif Mat zpix = src == 0; Mat zpix = src == 0;
connectedComponents(zpix, labels, 8, CV_32S); connectedComponents(zpix, labels, 8, CV_32S);
} }
else else