generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix wrong checking of returned descriptor type

Browse Source
This commit is contained in:
Ievgen Khvedchenia 2014-04-28 22:25:27 +03:00
parent c1bf453266
commit a134e068ef
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/features2d/src/akaze.cpp
View File

@ -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
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())));
} }
} }

4
modules/features2d/src/kaze.cpp
View File

@ -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
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())));
} }
} }