Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
e93aa158
Commit
e93aa158
authored
Apr 03, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8496 from Sahloul:fixes/wrappers/imgproc/EMD
parents
297ba853
6a856d67
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
imgproc.hpp
modules/imgproc/include/opencv2/imgproc.hpp
+4
-0
emd.cpp
modules/imgproc/src/emd.cpp
+7
-0
No files found.
modules/imgproc/include/opencv2/imgproc.hpp
View file @
e93aa158
...
...
@@ -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
...
...
modules/imgproc/src/emd.cpp
View file @
e93aa158
...
...
@@ -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. */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment