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
4a430413
Commit
4a430413
authored
Nov 03, 2010
by
Maria Dimashova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor changes
parent
7bda8266
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
features2d.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
+0
-0
detectors.cpp
modules/features2d/src/detectors.cpp
+1
-1
matchers.cpp
modules/features2d/src/matchers.cpp
+2
-2
No files found.
modules/features2d/include/opencv2/features2d/features2d.hpp
View file @
4a430413
This diff is collapsed.
Click to expand it.
modules/features2d/src/detectors.cpp
View file @
4a430413
...
...
@@ -425,7 +425,7 @@ void GridAdaptedFeatureDetector::detect( const Mat& image, vector<KeyPoint>& key
}
/*
*
Gr
idAdaptedFeatureDetector
*
Pyram
idAdaptedFeatureDetector
*/
PyramidAdaptedFeatureDetector
::
PyramidAdaptedFeatureDetector
(
const
Ptr
<
FeatureDetector
>&
_detector
,
int
_levels
)
:
detector
(
_detector
),
levels
(
_levels
)
...
...
modules/features2d/src/matchers.cpp
View file @
4a430413
...
...
@@ -231,7 +231,7 @@ void BruteForceMatcher<L2<float> >::knnMatchImpl( const Mat& queryDescs, vector<
const
vector
<
Mat
>&
masks
,
bool
compactResult
)
{
#ifndef HAVE_EIGEN2
bfKnnMatchImpl
<
L2
<
float
>
>
(
*
this
,
queryDescs
,
matches
,
knn
,
masks
,
compactResult
);
bfKnnMatchImpl
(
*
this
,
queryDescs
,
matches
,
knn
,
masks
,
compactResult
);
#else
CV_Assert
(
queryDescs
.
type
()
==
CV_32FC1
||
queryDescs
.
empty
()
);
CV_Assert
(
masks
.
empty
()
||
masks
.
size
()
==
trainDescCollection
.
size
()
);
...
...
@@ -319,7 +319,7 @@ void BruteForceMatcher<L2<float> >::radiusMatchImpl( const Mat& queryDescs, vect
const
vector
<
Mat
>&
masks
,
bool
compactResult
)
{
#ifndef HAVE_EIGEN2
bfRadiusMatchImpl
<
L2
<
float
>
>
(
*
this
,
queryDescs
,
matches
,
maxDistance
,
masks
,
compactResult
);
bfRadiusMatchImpl
(
*
this
,
queryDescs
,
matches
,
maxDistance
,
masks
,
compactResult
);
#else
CV_Assert
(
queryDescs
.
type
()
==
CV_32FC1
||
queryDescs
.
empty
()
);
CV_Assert
(
masks
.
empty
()
||
masks
.
size
()
==
trainDescCollection
.
size
()
);
...
...
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