Thanks to visit codestin.com
Credit goes to github.com

Skip to content

imgproc: refactor EMD to reduce C-API usage #25469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 24, 2024
Merged

imgproc: refactor EMD to reduce C-API usage #25469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ff7ce3
imgproc: refactor EMD to reduce C-API usage
mshabunin Apr 20, 2024
75f49e6
fixup! imgproc: refactor EMD to reduce C-API usage
mshabunin Apr 22, 2024
42bb7df
fixup! imgproc: refactor EMD to reduce C-API usage
mshabunin Apr 22, 2024
a186f1d
fixup! imgproc: refactor EMD to reduce C-API usage
mshabunin Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions modules/imgproc/include/opencv2/imgproc/detail/legacy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ CV_EXPORTS void findContours_legacy(InputArray image,
int method,
Point offset = Point());

CV_EXPORTS float EMD_legacy( InputArray _signature1, InputArray _signature2,
int distType, InputArray _cost,
float* lowerBound, OutputArray _flow );

CV_EXPORTS float wrapperEMD_legacy(InputArray _signature1, InputArray _signature2,
int distType, InputArray _cost,
Ptr<float> lowerBound, OutputArray _flow);

#endif

} // namespace cv
Expand Down
5 changes: 3 additions & 2 deletions modules/imgproc/src/emd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
==========================================================================
*/
#include "precomp.hpp"
#include "opencv2/imgproc/detail/legacy.hpp"

#define MAX_ITERATIONS 500
#define CV_EMD_INF ((float)1e20)
Expand Down Expand Up @@ -1147,7 +1148,7 @@ icvDistC( const float *x, const float *y, void *user_param )
}


float cv::EMD( InputArray _signature1, InputArray _signature2,
float cv::EMD_legacy( InputArray _signature1, InputArray _signature2,
int distType, InputArray _cost,
float* lowerBound, OutputArray _flow )
{
Expand All @@ -1171,7 +1172,7 @@ float cv::EMD( InputArray _signature1, InputArray _signature2,
_flow.needed() ? &_cflow : 0, lowerBound, 0 );
}

float cv::wrapperEMD(InputArray _signature1, InputArray _signature2,
float cv::wrapperEMD_legacy(InputArray _signature1, InputArray _signature2,
int distType, InputArray _cost,
Ptr<float> lowerBound, OutputArray _flow)
{
Expand Down
Loading