|
|
@ -171,7 +171,7 @@ CV_FeatureDetectorTest gfttTest( "detector_gftt", createFeatureDetector("GFTT") |
|
|
|
CV_FeatureDetectorTest harrisTest( "detector_harris", createFeatureDetector("HARRIS") ); |
|
|
|
CV_FeatureDetectorTest harrisTest( "detector_harris", createFeatureDetector("HARRIS") ); |
|
|
|
CV_FeatureDetectorTest mserTest( "detector_mser", createFeatureDetector("MSER") ); |
|
|
|
CV_FeatureDetectorTest mserTest( "detector_mser", createFeatureDetector("MSER") ); |
|
|
|
CV_FeatureDetectorTest siftTest( "detector_sift", createFeatureDetector("SIFT") ); |
|
|
|
CV_FeatureDetectorTest siftTest( "detector_sift", createFeatureDetector("SIFT") ); |
|
|
|
//CV_FeatureDetectorTest starTest( "detector_star", createFeatureDetector("STAR") );
|
|
|
|
CV_FeatureDetectorTest starTest( "detector_star", createFeatureDetector("STAR") ); |
|
|
|
CV_FeatureDetectorTest surfTest( "detector_surf", createFeatureDetector("SURF") ); |
|
|
|
CV_FeatureDetectorTest surfTest( "detector_surf", createFeatureDetector("SURF") ); |
|
|
|
|
|
|
|
|
|
|
|
/****************************************************************************************\
|
|
|
|
/****************************************************************************************\
|
|
|
@ -320,10 +320,10 @@ public: |
|
|
|
} |
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
//CV_DescriptorExtractorTest siftDescriptorTest( "descriptor_sift", std::numeric_limits<float>::epsilon(),
|
|
|
|
CV_DescriptorExtractorTest siftDescriptorTest( "descriptor_sift", std::numeric_limits<float>::epsilon(), |
|
|
|
// createDescriptorExtractor("SIFT"), 8.06652f );
|
|
|
|
createDescriptorExtractor("SIFT"), 8.06652f ); |
|
|
|
//CV_DescriptorExtractorTest surfDescriptorTest( "descriptor_surf", std::numeric_limits<float>::epsilon(),
|
|
|
|
CV_DescriptorExtractorTest surfDescriptorTest( "descriptor_surf", std::numeric_limits<float>::epsilon(), |
|
|
|
// createDescriptorExtractor("SURF"), 0.147372f );
|
|
|
|
createDescriptorExtractor("SURF"), 0.147372f ); |
|
|
|
#if CV_SSE2 |
|
|
|
#if CV_SSE2 |
|
|
|
CV_CalonderDescriptorExtractorTest<uchar> ucharCalonderTest( "descriptor_calonder_uchar", |
|
|
|
CV_CalonderDescriptorExtractorTest<uchar> ucharCalonderTest( "descriptor_calonder_uchar", |
|
|
|
std::numeric_limits<float>::epsilon() + 1, |
|
|
|
std::numeric_limits<float>::epsilon() + 1, |
|
|
|