From ab8861fa1004c55900db61687ec6a7ad295f8613 Mon Sep 17 00:00:00 2001 From: Maria Dimashova Date: Tue, 8 Jun 2010 13:17:41 +0000 Subject: [PATCH] fixed assert() in BruteForceMatcher::matchImpl() --- modules/features2d/include/opencv2/features2d/features2d.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp index c83fea0dbb..6a555cbb41 100644 --- a/modules/features2d/include/opencv2/features2d/features2d.hpp +++ b/modules/features2d/include/opencv2/features2d/features2d.hpp @@ -1650,7 +1650,7 @@ void BruteForceMatcher::matchImpl( const Mat& descriptors_1, const Mat assert( mask.empty() || (mask.rows == descriptors_1.rows && mask.cols == descriptors_2.rows) ); - assert( descriptors_1.cols == descriptors_2.cols ); + assert( descriptors_1.cols == descriptors_2.cols || descriptors_1.empty() || descriptors_2.empty() ); assert( DataType::type == descriptors_1.type() || descriptors_1.empty() ); assert( DataType::type == descriptors_2.type() || descriptors_2.empty() );