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
dc14b456
Commit
dc14b456
authored
Aug 08, 2011
by
Maria Dimashova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor changes
parent
5c691907
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
detectors.cpp
modules/features2d/src/detectors.cpp
+6
-3
draw.cpp
modules/features2d/src/draw.cpp
+4
-2
sift.cpp
modules/features2d/src/sift.cpp
+3
-1
No files found.
modules/features2d/src/detectors.cpp
View file @
dc14b456
...
@@ -575,8 +575,9 @@ void GridAdaptedFeatureDetector::detectImpl( const Mat& image, vector<KeyPoint>&
...
@@ -575,8 +575,9 @@ void GridAdaptedFeatureDetector::detectImpl( const Mat& image, vector<KeyPoint>&
vector
<
KeyPoint
>
sub_keypoints
;
vector
<
KeyPoint
>
sub_keypoints
;
detector
->
detect
(
sub_image
,
sub_keypoints
,
sub_mask
);
detector
->
detect
(
sub_image
,
sub_keypoints
,
sub_mask
);
keepStrongest
(
maxPerCell
,
sub_keypoints
);
keepStrongest
(
maxPerCell
,
sub_keypoints
);
for
(
std
::
vector
<
cv
::
KeyPoint
>::
iterator
it
=
sub_keypoints
.
begin
(),
end
=
sub_keypoints
.
end
();
std
::
vector
<
cv
::
KeyPoint
>::
iterator
it
=
sub_keypoints
.
begin
(),
it
!=
end
;
++
it
)
end
=
sub_keypoints
.
end
();
for
(
;
it
!=
end
;
++
it
)
{
{
it
->
pt
.
x
+=
col_range
.
start
;
it
->
pt
.
x
+=
col_range
.
start
;
it
->
pt
.
y
+=
row_range
.
start
;
it
->
pt
.
y
+=
row_range
.
start
;
...
@@ -618,7 +619,9 @@ void PyramidAdaptedFeatureDetector::detectImpl( const Mat& image, vector<KeyPoin
...
@@ -618,7 +619,9 @@ void PyramidAdaptedFeatureDetector::detectImpl( const Mat& image, vector<KeyPoin
// Detect on current level of the pyramid
// Detect on current level of the pyramid
vector
<
KeyPoint
>
new_pts
;
vector
<
KeyPoint
>
new_pts
;
detector
->
detect
(
src
,
new_pts
,
src_mask
);
detector
->
detect
(
src
,
new_pts
,
src_mask
);
for
(
vector
<
KeyPoint
>::
iterator
it
=
new_pts
.
begin
(),
end
=
new_pts
.
end
();
it
!=
end
;
++
it
)
vector
<
KeyPoint
>::
iterator
it
=
new_pts
.
begin
(),
end
=
new_pts
.
end
();
for
(
;
it
!=
end
;
++
it
)
{
{
it
->
pt
.
x
*=
multiplier
;
it
->
pt
.
x
*=
multiplier
;
it
->
pt
.
y
*=
multiplier
;
it
->
pt
.
y
*=
multiplier
;
...
...
modules/features2d/src/draw.cpp
View file @
dc14b456
...
@@ -113,10 +113,12 @@ void drawKeypoints( const Mat& image, const vector<KeyPoint>& keypoints, Mat& ou
...
@@ -113,10 +113,12 @@ void drawKeypoints( const Mat& image, const vector<KeyPoint>& keypoints, Mat& ou
bool
isRandColor
=
_color
==
Scalar
::
all
(
-
1
);
bool
isRandColor
=
_color
==
Scalar
::
all
(
-
1
);
CV_Assert
(
!
outImage
.
empty
()
);
CV_Assert
(
!
outImage
.
empty
()
);
for
(
vector
<
KeyPoint
>::
const_iterator
i
=
keypoints
.
begin
(),
ie
=
keypoints
.
end
();
i
!=
ie
;
++
i
)
vector
<
KeyPoint
>::
const_iterator
it
=
keypoints
.
begin
(),
end
=
keypoints
.
end
();
for
(
;
it
!=
end
;
++
it
)
{
{
Scalar
color
=
isRandColor
?
Scalar
(
rng
(
256
),
rng
(
256
),
rng
(
256
))
:
_color
;
Scalar
color
=
isRandColor
?
Scalar
(
rng
(
256
),
rng
(
256
),
rng
(
256
))
:
_color
;
_drawKeypoint
(
outImage
,
*
i
,
color
,
flags
);
_drawKeypoint
(
outImage
,
*
i
t
,
color
,
flags
);
}
}
}
}
...
...
modules/features2d/src/sift.cpp
View file @
dc14b456
...
@@ -1663,7 +1663,9 @@ void SIFT::operator()(const Mat& image, const Mat& mask,
...
@@ -1663,7 +1663,9 @@ void SIFT::operator()(const Mat& image, const Mat& mask,
// filter points by subMask and convert the points coordinates from subImage size to image size
// filter points by subMask and convert the points coordinates from subImage size to image size
KeyPointsFilter
::
runByPixelsMask
(
keypoints
,
subMask
);
KeyPointsFilter
::
runByPixelsMask
(
keypoints
,
subMask
);
int
dx
=
brect
.
x
,
dy
=
brect
.
y
;
int
dx
=
brect
.
x
,
dy
=
brect
.
y
;
for
(
vector
<
KeyPoint
>::
iterator
it
=
keypoints
.
begin
();
it
!=
keypoints
.
end
();
++
it
)
vector
<
KeyPoint
>::
iterator
it
=
keypoints
.
begin
(),
end
=
keypoints
.
end
();
for
(
;
it
!=
end
;
++
it
)
{
{
it
->
pt
.
x
+=
dx
;
it
->
pt
.
x
+=
dx
;
it
->
pt
.
y
+=
dy
;
it
->
pt
.
y
+=
dy
;
...
...
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