mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8496 from Sahloul:fixes/wrappers/imgproc/EMD

Browse Source
This commit is contained in:
Alexander Alekhin 2017-04-03 20:55:50 +00:00
commit e93aa158cf
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/include/opencv2/imgproc.hpp
View File

@ -3280,6 +3280,10 @@ CV_EXPORTS float EMD( InputArray signature1, InputArray signature2,
int distType, InputArray cost=noArray(), int distType, InputArray cost=noArray(),
float* lowerBound = 0, OutputArray flow = noArray() ); float* lowerBound = 0, OutputArray flow = noArray() );
CV_EXPORTS_AS(EMD) float wrapperEMD( InputArray signature1, InputArray signature2,
int distType, InputArray cost=noArray(),
CV_IN_OUT Ptr<float> lowerBound = Ptr<float>(), OutputArray flow = noArray() );
//! @} imgproc_hist //! @} imgproc_hist
/** @example watershed.cpp /** @example watershed.cpp

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

@ -1164,4 +1164,11 @@ float cv::EMD( InputArray _signature1, InputArray _signature2,
_flow.needed() ? &_cflow : 0, lowerBound, 0 ); _flow.needed() ? &_cflow : 0, lowerBound, 0 );
} }
float cv::wrapperEMD(InputArray _signature1, InputArray _signature2,
int distType, InputArray _cost,
Ptr<float> lowerBound, OutputArray _flow)
{
return EMD(_signature1, _signature2, distType, _cost, lowerBound.get(), _flow);
}
/* End of file. */ /* End of file. */