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
f74ef644
Commit
f74ef644
authored
Feb 16, 2014
by
Ilya Lavrenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed the signature of add method according to the base class
parent
3542da71
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
common_interfaces_of_descriptor_matchers.rst
...atures2d/doc/common_interfaces_of_descriptor_matchers.rst
+2
-2
features2d.hpp
modules/features2d/include/opencv2/features2d.hpp
+1
-1
matchers.cpp
modules/features2d/src/matchers.cpp
+5
-2
No files found.
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
View file @
f74ef644
...
...
@@ -28,7 +28,7 @@ with an image set. ::
public:
virtual ~DescriptorMatcher();
virtual void add( InputArray descriptors );
virtual void add( InputArray
OfArrays
descriptors );
const vector<Mat>& getTrainDescriptors() const;
virtual void clear();
...
...
@@ -265,7 +265,7 @@ Flann-based descriptor matcher. This matcher trains :ocv:class:`flann::Index_` o
const Ptr<flann::IndexParams>& indexParams=new flann::KDTreeIndexParams(),
const Ptr<flann::SearchParams>& searchParams=new flann::SearchParams() );
virtual void add(
const vector<Mat>&
descriptors );
virtual void add(
InputArrayOfArrays
descriptors );
virtual void clear();
virtual void train();
...
...
modules/features2d/include/opencv2/features2d.hpp
View file @
f74ef644
...
...
@@ -1157,7 +1157,7 @@ public:
CV_WRAP
FlannBasedMatcher
(
const
Ptr
<
flann
::
IndexParams
>&
indexParams
=
makePtr
<
flann
::
KDTreeIndexParams
>
(),
const
Ptr
<
flann
::
SearchParams
>&
searchParams
=
makePtr
<
flann
::
SearchParams
>
()
);
virtual
void
add
(
const
std
::
vector
<
Mat
>&
descriptors
);
virtual
void
add
(
InputArrayOfArrays
descriptors
);
virtual
void
clear
();
// Reads matcher object from a file node
...
...
modules/features2d/src/matchers.cpp
View file @
f74ef644
...
...
@@ -1199,9 +1199,12 @@ FlannBasedMatcher::FlannBasedMatcher( const Ptr<flann::IndexParams>& _indexParam
CV_Assert
(
_searchParams
);
}
void
FlannBasedMatcher
::
add
(
const
std
::
vector
<
Mat
>&
descriptors
)
void
FlannBasedMatcher
::
add
(
InputArrayOfArrays
_
descriptors
)
{
DescriptorMatcher
::
add
(
descriptors
);
DescriptorMatcher
::
add
(
_descriptors
);
std
::
vector
<
Mat
>
descriptors
;
_descriptors
.
getMatVector
(
descriptors
);
for
(
size_t
i
=
0
;
i
<
descriptors
.
size
();
i
++
)
{
addedDescCount
+=
descriptors
[
i
].
rows
;
...
...
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