ok; all the tests now pass

25a7d023 · Vadim Pisarevsky · c5261ea3 · 25a7d023 · 25a7d023 · 25a7d023
Commit 25a7d023 authored Oct 16, 2014 by Vadim Pisarevsky
Showing with 3 additions and 6 deletions

features2d.hpp modules/features2d/include/opencv2/features2d.hpp +3 -6

mser.cpp modules/features2d/src/mser.cpp +0 -0

test_keypoints.cpp modules/features2d/test/test_keypoints.cpp +0 -0

No files found.
--- a/modules/features2d/include/opencv2/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d.hpp
@@ -195,12 +195,9 @@ public:
          int _max_evolution=200, double _area_threshold=1.01,
          double _min_margin=0.003, int _edge_blur_size=5 );

-    CV_WRAP virtual int detectAndLabel( InputArray image, OutputArray label,
-                                        OutputArray stats=noArray() ) = 0;
-
-    CV_WRAP virtual void detectAndStore( InputArray image,
-                                         std::vector<std::vector<Point> >& msers,
-                                         OutputArray stats=noArray() ) = 0;
+    CV_WRAP virtual void detectRegions( InputArray image,
+                                        std::vector<std::vector<Point> >& msers,
+                                        std::vector<Rect>& bboxes ) = 0;
 };

 //! detects corners using FAST algorithm by E. Rosten

--- a/modules/features2d/src/mser.cpp
+++ b/modules/features2d/src/mser.cpp
--- a/modules/features2d/test/test_keypoints.cpp
+++ b/modules/features2d/test/test_keypoints.cpp