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

Fix parenthesis in assert statements

Browse Source
This commit is contained in:
Ievgen Khvedchenia
2014-04-28 10:51:09 +03:00
parent 0e243541f9
commit f3f0e06c4d
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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