Fix parenthesis in assert statements

pull/2673/head
Ievgen Khvedchenia 11 years ago
parent 0e243541f9
commit f3f0e06c4d
  1. 7
      modules/features2d/src/akaze.cpp
  2. 8
      modules/features2d/src/kaze.cpp

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

@ -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");
}
}
Loading…
Cancel
Save