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

pull/8523/head
Alexander Alekhin 8 years ago
commit e93aa158cf
  1. 4
      modules/imgproc/include/opencv2/imgproc.hpp
  2. 7
      modules/imgproc/src/emd.cpp

@ -3280,6 +3280,10 @@ CV_EXPORTS float EMD( InputArray signature1, InputArray signature2,
int distType, InputArray cost=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
/** @example watershed.cpp

@ -1164,4 +1164,11 @@ float cv::EMD( InputArray _signature1, InputArray _signature2,
_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. */

Loading…
Cancel
Save