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-09 11:08:32 +04:00
parent 42d45e0b02
commit 6119ae0ea9
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/imgproc/src/templmatch.cpp
View File

@@ -346,7 +346,6 @@ static bool ocl_matchTemplate( InputArray _img, InputArray _templ, OutputArray _
typedef IppStatus (CV_STDCALL * ippiGetBufferSize)(IppiSize, IppiSize, IppEnum, int*); typedef IppStatus (CV_STDCALL * ippiGetBufferSize)(IppiSize, IppiSize, IppEnum, int*);
typedef IppStatus (CV_STDCALL * ippimatchTemplate)(const void*, int, IppiSize, const void*, int, IppiSize, Ipp32f* , int , IppEnum , Ipp8u*); typedef IppStatus (CV_STDCALL * ippimatchTemplate)(const void*, int, IppiSize, const void*, int, IppiSize, Ipp32f* , int , IppEnum , Ipp8u*);
static bool ipp_matchTemplate(const Mat& src, const Mat& tpl, Mat& dst, int method) static bool ipp_matchTemplate(const Mat& src, const Mat& tpl, Mat& dst, int method)
{ {
if (src.channels() != 1 || (method!=CV_TM_SQDIFF && method!=CV_TM_CCORR)) if (src.channels() != 1 || (method!=CV_TM_SQDIFF && method!=CV_TM_CCORR))
@@ -392,12 +391,10 @@ static bool ipp_matchTemplate(const Mat& src, const Mat& tpl, Mat& dst, int meth
pBuffer = ippsMalloc_8u( bufSize ); pBuffer = ippsMalloc_8u( bufSize );
status = ippFunc(src.data, (int)src.step, srcRoiSize, tpl.data, (int)tpl.step, tplRoiSize, (Ipp32f*)dst.data, dst.step, funCfg, pBuffer); status = ippFunc(src.data, (int)src.step, srcRoiSize, tpl.data, (int)tpl.step, tplRoiSize, (Ipp32f*)dst.data, (int)dst.step, funCfg, pBuffer);
if (status < 0)
return false;
ippsFree( pBuffer ); ippsFree( pBuffer );
return true; return status >= 0;
} }
#endif #endif