Skip to content

O
opencv
Commit a134e068 authored by Ievgen Khvedchenia's avatar Ievgen Khvedchenia
Browse files
Options

Fix wrong checking of returned descriptor type

parent c1bf4532
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
modules/features2d/src/akaze.cpp
View file @ a134e068
...@@ -151,7 +151,7 @@ namespace cv ...@@ -151,7 +151,7 @@ namespace cv
impl.Compute_Descriptors(keypoints, desc); impl.Compute_Descriptors(keypoints, desc);
CV_Assert((!desc.rows || desc.cols == descriptorSize())); 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 void AKAZE::detectImpl(InputArray image, std::vector<KeyPoint>& keypoints, InputArray mask) const
...@@ -197,6 +197,6 @@ namespace cv ...@@ -197,6 +197,6 @@ namespace cv
impl.Compute_Descriptors(keypoints, desc); impl.Compute_Descriptors(keypoints, desc);
CV_Assert((!desc.rows || desc.cols == descriptorSize())); CV_Assert((!desc.rows || desc.cols == descriptorSize()));
CV_Assert((!desc.rows || (desc.type() & descriptorType()))); CV_Assert((!desc.rows || (desc.type() == descriptorType())));
} }
} }
\ No newline at end of file
modules/features2d/src/kaze.cpp
View file @ a134e068
...@@ -120,7 +120,7 @@ namespace cv ...@@ -120,7 +120,7 @@ namespace cv
impl.Feature_Description(keypoints, desc); impl.Feature_Description(keypoints, desc);
CV_Assert((!desc.rows || desc.cols == descriptorSize())); 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 void KAZE::detectImpl(InputArray image, std::vector<KeyPoint>& keypoints, InputArray mask) const
...@@ -168,6 +168,6 @@ namespace cv ...@@ -168,6 +168,6 @@ namespace cv
impl.Feature_Description(keypoints, desc); impl.Feature_Description(keypoints, desc);
CV_Assert((!desc.rows || desc.cols == descriptorSize())); CV_Assert((!desc.rows || desc.cols == descriptorSize()));
CV_Assert((!desc.rows || (desc.type() & descriptorType()))); CV_Assert((!desc.rows || (desc.type() == descriptorType())));
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment