Merge pull request #2648 from ilya-lavrenov:ipp_dist

This commit is contained in:
Alexander Alekhin 2014-04-22 19:00:01 +04:00 committed by OpenCV Buildbot
commit e42057c487

View File

@ -745,9 +745,9 @@ void cv::distanceTransform( InputArray _src, OutputArray _dst, OutputArray _labe
status = ippiTrueDistanceTransformGetBufferSize_8u32f_C1R(roi, &bufSize); status = ippiTrueDistanceTransformGetBufferSize_8u32f_C1R(roi, &bufSize);
if (status>=0) if (status>=0)
{ {
pBuffer = ippsMalloc_8u( bufSize ); pBuffer = (Ipp8u *)ippMalloc( bufSize );
status = ippiTrueDistanceTransform_8u32f_C1R(src.ptr<uchar>(),(int)src.step, dst.ptr<float>(), (int)dst.step, roi, pBuffer); status = ippiTrueDistanceTransform_8u32f_C1R(src.ptr<uchar>(),(int)src.step, dst.ptr<float>(), (int)dst.step, roi, pBuffer);
ippsFree( pBuffer ); ippFree( pBuffer );
if (status>=0) if (status>=0)
return; return;
setIppErrorStatus(); setIppErrorStatus();