projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
98f6a4a
)
Fixed a bug #2892
author
Ivan Korolev
<ivan.korolev@itseez.com>
Fri, 14 Jun 2013 04:21:42 +0000
(08:21 +0400)
committer
Ivan Korolev
<ivan.korolev@itseez.com>
Fri, 14 Jun 2013 04:21:42 +0000
(08:21 +0400)
modules/nonfree/src/sift.cpp
patch
|
blob
|
history
diff --git
a/modules/nonfree/src/sift.cpp
b/modules/nonfree/src/sift.cpp
index
58ebd31
..
5a7fd89
100644
(file)
--- a/
modules/nonfree/src/sift.cpp
+++ b/
modules/nonfree/src/sift.cpp
@@
-774,9
+774,6
@@
void SIFT::operator()(InputArray _image, InputArray _mask,
findScaleSpaceExtrema(gpyr, dogpyr, keypoints);
KeyPointsFilter::removeDuplicated( keypoints );
- if( !mask.empty() )
- KeyPointsFilter::runByPixelsMask( keypoints, mask );
-
if( nfeatures > 0 )
KeyPointsFilter::retainBest(keypoints, nfeatures);
//t = (double)getTickCount() - t;
@@
-791,6
+788,9
@@
void SIFT::operator()(InputArray _image, InputArray _mask,
kpt.pt *= scale;
kpt.size *= scale;
}
+
+ if( !mask.empty() )
+ KeyPointsFilter::runByPixelsMask( keypoints, mask );
}
else
{