Merge pull request #2648 from ilya-lavrenov:ipp_dist

e42057c4 · Alexander Alekhin · OpenCV Buildbot · cd01d705 · 640c9667 · e42057c4
Commit e42057c4 authored Apr 22, 2014 by Alexander Alekhin Committed by OpenCV Buildbot Apr 22, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

distransform.cpp modules/imgproc/src/distransform.cpp +2 -2

No files found.
--- a/modules/imgproc/src/distransform.cpp
+++ b/modules/imgproc/src/distransform.cpp
@@ -745,9 +745,9 @@ void cv::distanceTransform( InputArray _src, OutputArray _dst, OutputArray _labe
            status = ippiTrueDistanceTransformGetBufferSize_8u32f_C1R(roi, &bufSize);
            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);
-                ippsFree( pBuffer );
+                ippFree( pBuffer );
                if (status>=0)
                    return;
                setIppErrorStatus();