restored 2 methods (for backward compatibility)

2011-05-11 12:59:36 +00:00
parent af28d19b3a
commit c46b510f4c
3 changed files with 36 additions and 12 deletions
--- a/modules/features2d/src/descriptors.cpp
+++ b/modules/features2d/src/descriptors.cpp
@@ -89,6 +89,12 @@ bool DescriptorExtractor::empty() const
    return false;
 }

+void DescriptorExtractor::removeBorderKeypoints( vector<KeyPoint>& keypoints,
+                                                 Size imageSize, int borderSize )
+{
+    KeyPointsFilter::runByImageBorder( keypoints, imageSize, borderSize );
+}
+
 Ptr<DescriptorExtractor> DescriptorExtractor::create(const string& descriptorExtractorType)
 {
    DescriptorExtractor* de = 0;
--- a/modules/features2d/src/detectors.cpp
+++ b/modules/features2d/src/detectors.cpp
@@ -82,6 +82,11 @@ bool FeatureDetector::empty() const
    return false;
 }

+void FeatureDetector::removeInvalidPoints( const Mat& mask, vector<KeyPoint>& keypoints )
+{
+    KeyPointsFilter::runByPixelsMask( keypoints, mask );
+}
+
 Ptr<FeatureDetector> FeatureDetector::create( const string& detectorType )
 {
    FeatureDetector* fd = 0;