now all the samples and opencv_contrib compile!

2014-10-16 16:34:22 +04:00
parent 09df1a286b
commit 06d4aa6060
9 changed files with 197 additions and 157 deletions
--- a/modules/features2d/include/opencv2/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d.hpp
@@ -197,6 +197,10 @@ public:

    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;
 };

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