Fix wrong checking of returned descriptor type

11 years ago · a134e068ef
parent c1bf453266
commit a134e068ef
2 changed files with 4 additions and 4 deletions
--- a/modules/features2d/src/akaze.cpp
+++ b/modules/features2d/src/akaze.cpp
@ -151,7 +151,7 @@ namespace cv
        impl.Compute_Descriptors(keypoints, desc);

        CV_Assert((!desc.rows || desc.cols == descriptorSize()));
-        CV_Assert((!desc.rows || (desc.type() & descriptorType())));
+        CV_Assert((!desc.rows || (desc.type() == descriptorType())));
    }

    void AKAZE::detectImpl(InputArray image, std::vector<KeyPoint>& keypoints, InputArray mask) const
@ -197,6 +197,6 @@ namespace cv
        impl.Compute_Descriptors(keypoints, desc);

        CV_Assert((!desc.rows || desc.cols == descriptorSize()));
-        CV_Assert((!desc.rows || (desc.type() & descriptorType())));
+        CV_Assert((!desc.rows || (desc.type() == descriptorType())));
    }
 }
--- a/modules/features2d/src/kaze.cpp
+++ b/modules/features2d/src/kaze.cpp
@ -120,7 +120,7 @@ namespace cv
        impl.Feature_Description(keypoints, desc);

        CV_Assert((!desc.rows || desc.cols == descriptorSize()));
-        CV_Assert((!desc.rows || (desc.type() & descriptorType())));
+        CV_Assert((!desc.rows || (desc.type() == descriptorType())));
    }

    void KAZE::detectImpl(InputArray image, std::vector<KeyPoint>& keypoints, InputArray mask) const
@ -168,6 +168,6 @@ namespace cv
        impl.Feature_Description(keypoints, desc);

        CV_Assert((!desc.rows || desc.cols == descriptorSize()));
-        CV_Assert((!desc.rows || (desc.type() & descriptorType())));
+        CV_Assert((!desc.rows || (desc.type() == descriptorType())));
    }
 }