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
0087c57e
Commit
0087c57e
authored
Dec 08, 2015
by
Balint Cristian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix KAZE/AKAZE descriptors to use angle instead radians.
parent
a15707bc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
AKAZEFeatures.cpp
modules/features2d/src/kaze/AKAZEFeatures.cpp
+6
-5
KAZEFeatures.cpp
modules/features2d/src/kaze/KAZEFeatures.cpp
+3
-3
No files found.
modules/features2d/src/kaze/AKAZEFeatures.cpp
View file @
0087c57e
...
...
@@ -191,7 +191,7 @@ public:
for
(
int
i
=
range
.
start
;
i
<
range
.
end
;
i
++
)
{
float
ratio
=
(
float
)
fastpow
(
2
,
evolution
[
i
].
octave
);
float
ratio
=
(
float
)
fastpow
(
2
,
evolution
[
i
].
octave
);
int
sigma_size_
=
fRound
(
evolution
[
i
].
esigma
*
options_
.
derivative_factor
/
ratio
);
compute_scharr_derivatives
(
evolution
[
i
].
Lsmooth
,
evolution
[
i
].
Lx
,
1
,
0
,
sigma_size_
);
...
...
@@ -1000,7 +1000,7 @@ void MSURF_Descriptor_64_Invoker::Get_MSURF_Descriptor_64(const KeyPoint& kpt, f
// Get the information from the keypoint
ratio
=
(
float
)(
1
<<
kpt
.
octave
);
scale
=
fRound
(
0.5
f
*
kpt
.
size
/
ratio
);
angle
=
kpt
.
angle
;
angle
=
(
kpt
.
angle
*
static_cast
<
float
>
(
CV_PI
))
/
180.
f
;
level
=
kpt
.
class_id
;
yf
=
kpt
.
pt
.
y
/
ratio
;
xf
=
kpt
.
pt
.
x
/
ratio
;
...
...
@@ -1406,8 +1406,9 @@ void MLDB_Full_Descriptor_Invoker::Get_MLDB_Full_Descriptor(const KeyPoint& kpt,
float
scale
=
(
float
)
fRound
(
0.5
f
*
kpt
.
size
/
ratio
);
float
xf
=
kpt
.
pt
.
x
/
ratio
;
float
yf
=
kpt
.
pt
.
y
/
ratio
;
float
co
=
cos
(
kpt
.
angle
);
float
si
=
sin
(
kpt
.
angle
);
float
angle
=
(
kpt
.
angle
*
static_cast
<
float
>
(
CV_PI
))
/
180.
f
;
float
co
=
cos
(
angle
);
float
si
=
sin
(
angle
);
int
pattern_size
=
options_
->
descriptor_pattern_size
;
int
dpos
=
0
;
...
...
@@ -1441,7 +1442,7 @@ void MLDB_Descriptor_Subset_Invoker::Get_MLDB_Descriptor_Subset(const KeyPoint&
// Get the information from the keypoint
float
ratio
=
(
float
)(
1
<<
kpt
.
octave
);
int
scale
=
fRound
(
0.5
f
*
kpt
.
size
/
ratio
);
float
angle
=
kpt
.
angle
;
float
angle
=
(
kpt
.
angle
*
static_cast
<
float
>
(
CV_PI
))
/
180.
f
;
int
level
=
kpt
.
class_id
;
float
yf
=
kpt
.
pt
.
y
/
ratio
;
float
xf
=
kpt
.
pt
.
x
/
ratio
;
...
...
modules/features2d/src/kaze/KAZEFeatures.cpp
View file @
0087c57e
...
...
@@ -512,7 +512,7 @@ public:
for
(
int
i
=
range
.
start
;
i
<
range
.
end
;
i
++
)
{
kpts
[
i
].
angle
=
0.0
;
if
(
options_
.
upright
)
if
(
options_
.
upright
)
{
kpts
[
i
].
angle
=
0.0
;
if
(
options_
.
extended
)
...
...
@@ -805,7 +805,7 @@ void KAZE_Descriptor_Invoker::Get_KAZE_Descriptor_64(const KeyPoint &kpt, float
yf
=
kpt
.
pt
.
y
;
xf
=
kpt
.
pt
.
x
;
scale
=
fRound
(
kpt
.
size
/
2.0
f
);
angle
=
kpt
.
angle
;
angle
=
(
kpt
.
angle
*
static_cast
<
float
>
(
CV_PI
))
/
180.
f
;
level
=
kpt
.
class_id
;
co
=
cos
(
angle
);
si
=
sin
(
angle
);
...
...
@@ -1088,7 +1088,7 @@ void KAZE_Descriptor_Invoker::Get_KAZE_Descriptor_128(const KeyPoint &kpt, float
yf
=
kpt
.
pt
.
y
;
xf
=
kpt
.
pt
.
x
;
scale
=
fRound
(
kpt
.
size
/
2.0
f
);
angle
=
kpt
.
angle
;
angle
=
(
kpt
.
angle
*
static_cast
<
float
>
(
CV_PI
))
/
180.
f
;
level
=
kpt
.
class_id
;
co
=
cos
(
angle
);
si
=
sin
(
angle
);
...
...
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