Commit 28f27554 authored by Roman Donchenko's avatar Roman Donchenko Committed by OpenCV Buildbot

Merge pull request #1137 from StevenPuttemans:bugfix_3131_24

parents 7eddf887 5caa8088
...@@ -59,6 +59,7 @@ CvFeatureTracker::CvFeatureTracker(CvFeatureTrackerParams _params) : ...@@ -59,6 +59,7 @@ CvFeatureTracker::CvFeatureTracker(CvFeatureTrackerParams _params) :
dd->set("nOctaveLayers", 5); dd->set("nOctaveLayers", 5);
dd->set("contrastThreshold", 0.04); dd->set("contrastThreshold", 0.04);
dd->set("edgeThreshold", 10.7); dd->set("edgeThreshold", 10.7);
break;
case CvFeatureTrackerParams::SURF: case CvFeatureTrackerParams::SURF:
dd = Algorithm::create<Feature2D>("Feature2D.SURF"); dd = Algorithm::create<Feature2D>("Feature2D.SURF");
if( dd.empty() ) if( dd.empty() )
...@@ -66,8 +67,10 @@ CvFeatureTracker::CvFeatureTracker(CvFeatureTrackerParams _params) : ...@@ -66,8 +67,10 @@ CvFeatureTracker::CvFeatureTracker(CvFeatureTrackerParams _params) :
dd->set("hessianThreshold", 400); dd->set("hessianThreshold", 400);
dd->set("nOctaves", 3); dd->set("nOctaves", 3);
dd->set("nOctaveLayers", 4); dd->set("nOctaveLayers", 4);
break;
default: default:
CV_Error(CV_StsBadArg, "Unknown feature type"); CV_Error(CV_StsBadArg, "Unknown feature type");
break;
} }
matcher = new BFMatcher(NORM_L2); matcher = new BFMatcher(NORM_L2);
......
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