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

Fix "conditional expression constant" warning

Browse Source
This commit is contained in:
Ievgen Khvedchenia
2014-04-28 16:23:58 +03:00
parent 2162aab0e9
commit cc0a94c536
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -150,8 +150,8 @@ namespace cv
impl.Compute_Descriptors(keypoints, desc);
CV_Assert((!desc.rows || desc.cols == descriptorSize()) && "Descriptor size does not match expected");
CV_Assert((!desc.rows || (desc.type() & descriptorType())) && "Descriptor type does not match expected");
CV_Assert((!desc.rows || desc.cols == descriptorSize()));
CV_Assert((!desc.rows || (desc.type() & descriptorType())));
}
void AKAZE::detectImpl(InputArray image, std::vector<KeyPoint>& keypoints, InputArray mask) const
@@ -196,7 +196,7 @@ namespace cv
impl.Create_Nonlinear_Scale_Space(img1_32);
impl.Compute_Descriptors(keypoints, desc);
CV_Assert((!desc.rows || desc.cols == descriptorSize()) && "Descriptor size does not match expected");
CV_Assert((!desc.rows || (desc.type() & descriptorType())) && "Descriptor type does not match expected");
CV_Assert((!desc.rows || desc.cols == descriptorSize()));
CV_Assert((!desc.rows || (desc.type() & descriptorType())));
}
}