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
4a05af68
Commit
4a05af68
authored
Jun 24, 2010
by
Maria Dimashova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed
parent
4eda856c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
detectors.cpp
modules/features2d/src/detectors.cpp
+1
-1
sift.cpp
modules/features2d/src/sift.cpp
+2
-3
No files found.
modules/features2d/src/detectors.cpp
View file @
4a05af68
...
...
@@ -335,7 +335,7 @@ FeatureDetector* createDetector( const string& detectorType )
}
else
if
(
!
detectorType
.
compare
(
"SURF"
)
)
{
fd
=
new
SurfFeatureDetector
(
1
00.
/*hessian_threshold*/
,
3
/*octaves*/
,
4
/*octave_layers*/
);
fd
=
new
SurfFeatureDetector
(
4
00.
/*hessian_threshold*/
,
3
/*octaves*/
,
4
/*octave_layers*/
);
}
else
if
(
!
detectorType
.
compare
(
"MSER"
)
)
{
...
...
modules/features2d/src/sift.cpp
View file @
4a05af68
...
...
@@ -2034,15 +2034,14 @@ SIFT::SIFT( const CommonParams& _commParams,
inline
KeyPoint
vlKeypointToOcv
(
const
VL
::
Sift
&
vlSift
,
const
VL
::
Sift
::
Keypoint
&
vlKeypoint
,
float
angle
)
{
float
size
=
SIFT
::
DescriptorParams
::
GET_DEFAULT_MAGNIFICATION
()
*
vlKeypoint
.
sigma
*
4
/*4==NBP*/
/
vlSift
.
getOctaveSamplingPeriod
(
vlKeypoint
.
o
);
float
size
=
vlKeypoint
.
sigma
*
SIFT
::
DescriptorParams
::
GET_DEFAULT_MAGNIFICATION
()
*
4
;
// 4==NBP
return
KeyPoint
(
vlKeypoint
.
x
,
vlKeypoint
.
y
,
size
,
angle
,
0
,
vlKeypoint
.
o
,
0
);
}
inline
void
ocvKeypointToVl
(
const
VL
::
Sift
&
vlSift
,
const
KeyPoint
&
ocvKeypoint
,
VL
::
Sift
::
Keypoint
&
vlKeypoint
,
int
magnification
)
{
float
sigma
=
ocvKeypoint
.
size
*
vlSift
.
getOctaveSamplingPeriod
(
ocvKeypoint
.
octave
)
/
(
magnification
*
4
)
/*4==NBP*/
;
float
sigma
=
ocvKeypoint
.
size
/
(
SIFT
::
DescriptorParams
::
GET_DEFAULT_MAGNIFICATION
()
*
4
);
// 4==NBP
vlKeypoint
=
vlSift
.
getKeypoint
(
ocvKeypoint
.
pt
.
x
,
ocvKeypoint
.
pt
.
y
,
sigma
);
}
...
...
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