quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)

This commit is contained in:
Vadim Pisarevsky
2014-10-18 20:44:26 +04:00
parent 22ff1e8826
commit d2b9dc5530
29 changed files with 278 additions and 312 deletions

View File

@@ -40,7 +40,7 @@ int main( int argc, char** argv )
int ndisparities = 16*5; /**< Range of disparity */
int SADWindowSize = 21; /**< Size of the block window. Must be odd */
Ptr<StereoBM> sbm = createStereoBM( ndisparities, SADWindowSize );
Ptr<StereoBM> sbm = StereoBM::create( ndisparities, SADWindowSize );
//-- 3. Calculate the disparity image
sbm->compute( imgLeft, imgRight, imgDisparity16S );

View File

@@ -135,18 +135,19 @@ int main(int argc, char **argv)
return 1;
}
fs["bounding_box"] >> bb;
Ptr<Feature2D> akaze = AKAZE::create();
Stats stats, akaze_stats, orb_stats;
Ptr<AKAZE> akaze = AKAZE::create();
akaze->set("threshold", akaze_thresh);
Ptr<Feature2D> orb = ORB::create();
Ptr<ORB> orb = ORB::create();
orb->setMaxFeatures(stats.keypoints);
Ptr<DescriptorMatcher> matcher = DescriptorMatcher::create("BruteForce-Hamming");
Tracker akaze_tracker(akaze, matcher);
Tracker orb_tracker(orb, matcher);
Stats stats, akaze_stats, orb_stats;
Mat frame;
video_in >> frame;
akaze_tracker.setFirstFrame(frame, bb, "AKAZE", stats);
orb_tracker.getDetector()->set("nFeatures", stats.keypoints);
orb_tracker.setFirstFrame(frame, bb, "ORB", stats);
Stats akaze_draw_stats, orb_draw_stats;