added empty() method to common features2d classes; fixed #831

2011-01-31 14:18:50 +00:00
parent fa446e7e35
commit 9b4c682623
7 changed files with 112 additions and 19 deletions
--- a/modules/features2d/src/descriptors.cpp
+++ b/modules/features2d/src/descriptors.cpp
@@ -96,6 +96,11 @@ void DescriptorExtractor::read( const FileNode& )
 void DescriptorExtractor::write( FileStorage& ) const
 {}

+bool DescriptorExtractor::empty() const
+{
+    return false;
+}
+
 void DescriptorExtractor::removeBorderKeypoints( vector<KeyPoint>& keypoints,
                                                 Size imageSize, int borderSize )
 {
@@ -361,4 +366,9 @@ int OpponentColorDescriptorExtractor::descriptorType() const
    return descriptorExtractor->descriptorType();
 }

+bool OpponentColorDescriptorExtractor::empty() const
+{
+    return descriptorExtractor.empty() || (DescriptorExtractor*)(descriptorExtractor)->empty();
+}
+
 }