Commit 8104db22 authored by Alexander Alekhin's avatar Alexander Alekhin

Merge pull request #7130 from souch55:Fixed

parents a5dcefd5 ce818dc0
......@@ -621,8 +621,7 @@ void DescriptorMatcher::checkMasks( InputArrayOfArrays _masks, int queryDescript
{
int rows = trainDescCollection[i].empty() ? utrainDescCollection[i].rows : trainDescCollection[i].rows;
CV_Assert( masks[i].rows == queryDescriptorsCount &&
(masks[i].cols == rows || masks[i].cols == rows) &&
masks[i].type() == CV_8UC1 );
masks[i].cols == rows && masks[i].type() == CV_8UC1);
}
}
}
......@@ -1375,5 +1374,4 @@ void FlannBasedMatcher::radiusMatchImpl( InputArray _queryDescriptors, std::vect
convertToDMatches( mergedDescriptors, indices, dists, matches );
}
}
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