From 4a05af684f660f94176e7fd3443472b9b69baef0 Mon Sep 17 00:00:00 2001 From: Maria Dimashova Date: Thu, 24 Jun 2010 08:18:29 +0000 Subject: [PATCH] fixed --- modules/features2d/src/detectors.cpp | 2 +- modules/features2d/src/sift.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/features2d/src/detectors.cpp b/modules/features2d/src/detectors.cpp index dbf91a6..098ca0a 100644 --- a/modules/features2d/src/detectors.cpp +++ b/modules/features2d/src/detectors.cpp @@ -335,7 +335,7 @@ FeatureDetector* createDetector( const string& detectorType ) } else if( !detectorType.compare( "SURF" ) ) { - fd = new SurfFeatureDetector( 100./*hessian_threshold*/, 3 /*octaves*/, 4/*octave_layers*/ ); + fd = new SurfFeatureDetector( 400./*hessian_threshold*/, 3 /*octaves*/, 4/*octave_layers*/ ); } else if( !detectorType.compare( "MSER" ) ) { diff --git a/modules/features2d/src/sift.cpp b/modules/features2d/src/sift.cpp index a2e93b9..954a204 100644 --- a/modules/features2d/src/sift.cpp +++ b/modules/features2d/src/sift.cpp @@ -2034,15 +2034,14 @@ SIFT::SIFT( const CommonParams& _commParams, inline KeyPoint vlKeypointToOcv( const VL::Sift& vlSift, const VL::Sift::Keypoint& vlKeypoint, float angle ) { - float size = SIFT::DescriptorParams::GET_DEFAULT_MAGNIFICATION()*vlKeypoint.sigma*4 /*4==NBP*/ - / vlSift.getOctaveSamplingPeriod(vlKeypoint.o); + float size = vlKeypoint.sigma*SIFT::DescriptorParams::GET_DEFAULT_MAGNIFICATION()*4;// 4==NBP return KeyPoint( vlKeypoint.x, vlKeypoint.y, size, angle, 0, vlKeypoint.o, 0 ); } inline void ocvKeypointToVl( const VL::Sift& vlSift, const KeyPoint& ocvKeypoint, VL::Sift::Keypoint& vlKeypoint, int magnification ) { - float sigma = ocvKeypoint.size*vlSift.getOctaveSamplingPeriod(ocvKeypoint.octave) / (magnification*4) /*4==NBP*/; + float sigma = ocvKeypoint.size/(SIFT::DescriptorParams::GET_DEFAULT_MAGNIFICATION()*4);// 4==NBP vlKeypoint = vlSift.getKeypoint( ocvKeypoint.pt.x, ocvKeypoint.pt.y, sigma); } -- 2.7.4