added const in MSER::operator()

[opencv.git] / opencv / include / opencv / cv.hpp

diff --git a/opencv/include/opencv/cv.hpp b/opencv/include/opencv/cv.hpp
index 8ac06270b7ac316576e52c54af6b15206e5dfa17..d2826fce40e42b3cc6ae752966646613c4becad1 100644 (file)
--- a/opencv/include/opencv/cv.hpp
+++ b/opencv/include/opencv/cv.hpp
@@ -40,8 +40,8 @@
 //
 //M*/
 
-#ifndef _CV_HPP_
-#define _CV_HPP_
+#ifndef __OPENCV_CV_HPP__
+#define __OPENCV_CV_HPP__
 
 #ifdef __cplusplus
 
@@ -512,11 +512,11 @@ enum { CHAIN_APPROX_NONE=CV_CHAIN_APPROX_NONE,
        CHAIN_APPROX_TC89_L1=CV_CHAIN_APPROX_TC89_L1,
        CHAIN_APPROX_TC89_KCOS=CV_CHAIN_APPROX_TC89_KCOS };
 
-CV_EXPORTS void findContours( const Mat& image, vector<vector<Point> >& contours,
+CV_EXPORTS void findContours( Mat& image, vector<vector<Point> >& contours,
                               vector<Vec4i>& hierarchy, int mode,
                               int method, Point offset=Point());
 
-CV_EXPORTS void findContours( const Mat& image, vector<vector<Point> >& contours,
+CV_EXPORTS void findContours( Mat& image, vector<vector<Point> >& contours,
                               int mode, int method, Point offset=Point());
 
 CV_EXPORTS void drawContours( Mat& image, const vector<vector<Point> >& contours,
@@ -534,7 +534,7 @@ CV_EXPORTS void approxPolyDP( const Mat& curve,
     
 CV_EXPORTS double arcLength( const Mat& curve, bool closed );
 CV_EXPORTS Rect boundingRect( const Mat& points );
-CV_EXPORTS double contourArea( const Mat& contour );    
+CV_EXPORTS double contourArea( const Mat& contour, bool oriented=false );    
 CV_EXPORTS RotatedRect minAreaRect( const Mat& points );
 CV_EXPORTS void minEnclosingCircle( const Mat& points,
                                     Point2f& center, float& radius );    
@@ -621,6 +621,7 @@ public:
 ///////////////////////////// Object Detection ////////////////////////////
 
 CV_EXPORTS void groupRectangles(vector<Rect>& rectList, int groupThreshold, double eps=0.2);
+CV_EXPORTS void groupRectangles(vector<Rect>& rectList, vector<int>& weights, int groupThreshold, double eps=0.2);
         
 class CV_EXPORTS FeatureEvaluator
 {
@@ -907,7 +908,7 @@ public:
 };
 
     
-class StereoSGBM
+class CV_EXPORTS StereoSGBM
 {
 public:
     enum { DISP_SHIFT=4, DISP_SCALE = (1<<DISP_SHIFT) };
@@ -916,7 +917,8 @@ public:
     StereoSGBM(int minDisparity, int numDisparities, int SADWindowSize,
                int P1=0, int P2=0, int disp12MaxDiff=0,
                int preFilterCap=0, int uniquenessRatio=0,
-               int speckleWindowSize=0, int speckleRange=0);
+               int speckleWindowSize=0, int speckleRange=0,
+               bool fullDP=false);
     virtual ~StereoSGBM();
     
     virtual void operator()(const Mat& left, const Mat& right, Mat& disp);
@@ -930,6 +932,7 @@ public:
     int speckleWindowSize;
     int speckleRange;
     int disp12MaxDiff;
+    bool fullDP;
     
 protected:
     Mat buffer;
@@ -937,6 +940,14 @@ protected:
 
     
 CV_EXPORTS void filterSpeckles( Mat& img, double newVal, int maxSpeckleSize, double maxDiff, Mat& buf );
+    
+CV_EXPORTS Rect getValidDisparityROI( Rect roi1, Rect roi2,
+                                int minDisparity, int numberOfDisparities,
+                                int SADWindowSize );
+    
+CV_EXPORTS void validateDisparity( Mat& disparity, const Mat& cost,
+                                   int minDisparity, int numberOfDisparities,
+                                   int disp12MaxDisp=1 );
 
 CV_EXPORTS void reprojectImageTo3D( const Mat& disparity,
                                     Mat& _3dImage, const Mat& Q,
@@ -991,11 +1002,11 @@ public:
           float _max_variation, float _min_diversity,
           int _max_evolution, double _area_threshold,
           double _min_margin, int _edge_blur_size );
-    void operator()(Mat& image, vector<vector<Point> >& msers, const Mat& mask) const;
+    void operator()( const Mat& image, vector<vector<Point> >& msers, const Mat& mask ) const;
 };
 
 
-class CV_EXPORTS StarDetector : CvStarDetectorParams
+class CV_EXPORTS StarDetector : public CvStarDetectorParams
 {
 public:
     StarDetector();
@@ -1071,6 +1082,6 @@ struct CvLSHOperations
 
 #endif /* __cplusplus */
 
-#endif /* _CV_HPP_ */
+#endif
 
 /* End of file. */