From 41678fe3d3034683d6a8c6872295573af78ec2ae Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 7 Jul 2020 13:26:43 +0300 Subject: [PATCH] Fixed checkMasks in DescriptorMatcher with train descs in UMats --- modules/features2d/src/matchers.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/features2d/src/matchers.cpp b/modules/features2d/src/matchers.cpp index d39afe1ade..ee6e15bb31 100644 --- a/modules/features2d/src/matchers.cpp +++ b/modules/features2d/src/matchers.cpp @@ -622,15 +622,20 @@ void DescriptorMatcher::checkMasks( InputArrayOfArrays _masks, int queryDescript if( isMaskSupported() && !masks.empty() ) { // Check masks - size_t imageCount = std::max(trainDescCollection.size(), utrainDescCollection.size() ); + const size_t imageCount = std::max(trainDescCollection.size(), utrainDescCollection.size() ); CV_Assert( masks.size() == imageCount ); for( size_t i = 0; i < imageCount; i++ ) { - if( !masks[i].empty() && (!trainDescCollection[i].empty() || !utrainDescCollection[i].empty() ) ) + if (masks[i].empty()) + continue; + const bool hasTrainDesc = !trainDescCollection.empty() && !trainDescCollection[i].empty(); + const bool hasUTrainDesc = !utrainDescCollection.empty() && !utrainDescCollection[i].empty(); + if (hasTrainDesc || hasUTrainDesc) { - int rows = trainDescCollection[i].empty() ? utrainDescCollection[i].rows : trainDescCollection[i].rows; - CV_Assert( masks[i].rows == queryDescriptorsCount && - masks[i].cols == rows && masks[i].type() == CV_8UC1); + const int rows = hasTrainDesc ? trainDescCollection[i].rows : utrainDescCollection[i].rows; + CV_Assert(masks[i].type() == CV_8UC1 + && masks[i].rows == queryDescriptorsCount + && masks[i].cols == rows); } } }