Merge pull request #3572 from berak:python_samples_30

2015-01-15 13:17:26 +00:00
parent 713aa5c5b9 fd60e98c5b
commit df57d038b8
14 changed files with 27 additions and 26 deletions
--- a/modules/features2d/include/opencv2/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d.hpp
@@ -337,7 +337,7 @@ public:
          double _min_margin=0.003, int _edge_blur_size=5 );

    CV_WRAP virtual void detectRegions( InputArray image,
-                                        std::vector<std::vector<Point> >& msers,
+                                        CV_OUT std::vector<std::vector<Point> >& msers,
                                        std::vector<Rect>& bboxes ) = 0;

    CV_WRAP virtual void setDelta(int delta) = 0;