Skip to content

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

Fix parenthesis in assert statements

parent 0e243541
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
modules/features2d/src/akaze.cpp
View file @ f3f0e06c
......@@ -99,6 +99,9 @@ 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");
}
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.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()) && "Descriptor size does not match expected");
CV_Assert((!desc.rows || (desc.type() & descriptorType())) && "Descriptor type does not match expected");
}
}
\ No newline at end of file
modules/features2d/src/kaze.cpp
View file @ f3f0e06c
......@@ -70,8 +70,8 @@ namespace cv
impl.Feature_Description(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()) && "Descriptor size 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
......@@ -118,7 +118,7 @@ namespace cv
impl.Create_Nonlinear_Scale_Space(img1_32);
impl.Feature_Description(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()) && "Descriptor size does not match expected");
CV_Assert((!desc.rows || (desc.type() & descriptorType())) && "Descriptor type does not match expected");
}
}
\ 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