From fffe2464cd77da8ca90de08aa34d186175f342a1 Mon Sep 17 00:00:00 2001 From: orestis Date: Sun, 21 Dec 2014 21:27:03 +0200 Subject: [PATCH] Change DescriptorExtractor_ORB regression test to compensate for neon ieee754 non-compliancy. Also changed the comparison between max valid and calculated distance to make the error message more accurate (in case curMaxDist == maxDist) --- modules/features2d/test/test_descriptors_regression.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/features2d/test/test_descriptors_regression.cpp b/modules/features2d/test/test_descriptors_regression.cpp index 04449bdfc..e40fe9fb1 100644 --- a/modules/features2d/test/test_descriptors_regression.cpp +++ b/modules/features2d/test/test_descriptors_regression.cpp @@ -132,7 +132,7 @@ protected: stringstream ss; ss << "Max distance between valid and computed descriptors " << curMaxDist; - if( curMaxDist < maxDist ) + if( curMaxDist <= maxDist ) ss << "." << endl; else { @@ -322,7 +322,11 @@ TEST( Features2d_DescriptorExtractor_ORB, regression ) { // TODO adjust the parameters below CV_DescriptorExtractorTest test( "descriptor-orb", +#if CV_NEON + (CV_DescriptorExtractorTest::DistanceType)25.f, +#else (CV_DescriptorExtractorTest::DistanceType)12.f, +#endif ORB::create() ); test.safe_run(); }