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
cdbf1f9e
Commit
cdbf1f9e
authored
Jul 28, 2010
by
Maria Dimashova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed compile errors on VS 2008
parent
fb2a4a83
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
keypoint.cpp
modules/features2d/src/keypoint.cpp
+11
-11
No files found.
modules/features2d/src/keypoint.cpp
View file @
cdbf1f9e
...
...
@@ -113,21 +113,21 @@ float KeyPoint::overlap( const KeyPoint& kp1, const KeyPoint& kp2 )
{
const
int
seedsPerDim
=
50
;
float
rad1
=
kp1
.
size
/
2
,
rad
2
=
kp2
.
size
/
2
;
float
rad
1_2
=
rad1
*
rad
1
,
rad
2_2
=
rad2
*
rad
2
;
float
radius1
=
kp1
.
size
/
2
;
float
radius
2
=
kp2
.
size
/
2
;
float
rad
ius1_2
=
radius1
*
radius
1
,
rad
ius2_2
=
radius2
*
radius
2
;
Point2f
p1
=
kp1
.
pt
,
p2
=
kp2
.
pt
;
float
dist
=
norm
(
p1
-
p2
);
float
ovrl
=
0.
f
;
if
(
dist
<
rad
1
+
rad
2
)
// circles are intersected
if
(
dist
<
rad
ius1
+
radius
2
)
// circles are intersected
{
float
minx
=
min
(
p1
.
x
-
rad
1
,
p2
.
x
-
rad
2
);
float
maxx
=
max
(
p1
.
x
+
rad
1
,
p2
.
x
+
rad
2
);
float
miny
=
min
(
p1
.
y
-
rad
1
,
p2
.
y
-
rad
2
);
float
maxy
=
max
(
p1
.
y
+
rad
1
,
p2
.
y
+
rad
2
);
float
minx
=
min
(
p1
.
x
-
rad
ius1
,
p2
.
x
-
radius
2
);
float
maxx
=
max
(
p1
.
x
+
rad
ius1
,
p2
.
x
+
radius
2
);
float
miny
=
min
(
p1
.
y
-
rad
ius1
,
p2
.
y
-
radius
2
);
float
maxy
=
max
(
p1
.
y
+
rad
ius1
,
p2
.
y
+
radius
2
);
float
mina
=
(
maxx
-
minx
)
<
(
maxy
-
miny
)
?
(
maxx
-
minx
)
:
(
maxy
-
miny
);
float
step
=
mina
/
seedsPerDim
;
...
...
@@ -147,8 +147,8 @@ float KeyPoint::overlap( const KeyPoint& kp1, const KeyPoint& kp2 )
float
c1
=
rx1
*
rx1
+
ry1
*
ry1
;
float
c2
=
rx2
*
rx2
+
ry2
*
ry2
;
if
(
c1
<
rad
1_2
&&
c2
<
rad
2_2
)
bna
++
;
if
(
c1
<
rad
1_2
||
c2
<
rad
2_2
)
bua
++
;
if
(
c1
<
rad
ius1_2
&&
c2
<
radius
2_2
)
bna
++
;
if
(
c1
<
rad
ius1_2
||
c2
<
radius
2_2
)
bua
++
;
}
}
if
(
bna
>
0
)
...
...
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