fixed several test failures; currently 9 out of 73 tests fail

2014-10-16 17:00:40 +04:00
parent 06d4aa6060
commit 162384a838
9 changed files with 67 additions and 25 deletions
--- a/modules/features2d/src/feature2d.cpp
+++ b/modules/features2d/src/feature2d.cpp
@@ -60,6 +60,11 @@ void Feature2D::detect( InputArray image,
                        std::vector<KeyPoint>& keypoints,
                        InputArray mask )
 {
+    if( image.empty() )
+    {
+        keypoints.clear();
+        return;
+    }
    detectAndCompute(image, mask, keypoints, noArray(), false);
 }

@@ -97,6 +102,11 @@ void Feature2D::compute( InputArray image,
                         std::vector<KeyPoint>& keypoints,
                         OutputArray descriptors )
 {
+    if( image.empty() )
+    {
+        descriptors.release();
+        return;
+    }
    detectAndCompute(image, noArray(), keypoints, descriptors, true);
 }