From 0e3bbd702624b5a35252a9246f4d34520c7954a7 Mon Sep 17 00:00:00 2001 From: Ievgen Khvedchenia Date: Mon, 28 Apr 2014 19:32:04 +0300 Subject: [PATCH] Fix "conditional expression constant" warning --- modules/features2d/src/akaze/AKAZEFeatures.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/features2d/src/akaze/AKAZEFeatures.cpp b/modules/features2d/src/akaze/AKAZEFeatures.cpp index 527abadc3..ece1d7b30 100644 --- a/modules/features2d/src/akaze/AKAZEFeatures.cpp +++ b/modules/features2d/src/akaze/AKAZEFeatures.cpp @@ -2145,7 +2145,7 @@ void generateDescriptorSubsample(cv::Mat& sampleList, cv::Mat& comparisons, int } ssz *= nchannels; - CV_Assert((nbits <= ssz) && "descriptor size can't be bigger than full descriptor"); + CV_Assert(nbits <= ssz); // Descriptor size can't be bigger than full descriptor // Since the full descriptor is usually under 10k elements, we pick // the selection from the full matrix. We take as many samples per