Merge pull request #189 from mshabunin/fix-headers

Replaced property macros in headers

modules/face/include/opencv2/face/facerec.hpp

@@ -20,13 +20,19 @@ namespace cv { namespace face {
 class CV_EXPORTS_W BasicFaceRecognizer : public FaceRecognizer
 {
 public:
-    CV_PURE_PROPERTY(int, NumComponents)
-    CV_PURE_PROPERTY(double, Threshold)
-    CV_PURE_PROPERTY_RO(std::vector<cv::Mat>, Projections)
-    CV_PURE_PROPERTY_RO(cv::Mat, Labels)
-    CV_PURE_PROPERTY_RO(cv::Mat, EigenValues)
-    CV_PURE_PROPERTY_RO(cv::Mat, EigenVectors)
-    CV_PURE_PROPERTY_RO(cv::Mat, Mean)
+    /** @see setNumComponents */
+    virtual int getNumComponents() const = 0;
+    /** @copybrief getNumComponents @see getNumComponents */
+    virtual void setNumComponents(int val) = 0;
+    /** @see setThreshold */
+    virtual double getThreshold() const = 0;
+    /** @copybrief getThreshold @see getThreshold */
+    virtual void setThreshold(double val) = 0;
+    virtual std::vector<cv::Mat> getProjections() const = 0;
+    virtual cv::Mat getLabels() const = 0;
+    virtual cv::Mat getEigenValues() const = 0;
+    virtual cv::Mat getEigenVectors() const = 0;
+    virtual cv::Mat getMean() const = 0;
 };
 
 /**
@@ -95,13 +101,28 @@ CV_EXPORTS_W Ptr<BasicFaceRecognizer> createFisherFaceRecognizer(int num_compone
 class CV_EXPORTS_W LBPHFaceRecognizer : public FaceRecognizer
 {
 public:
-    CV_PURE_PROPERTY(int, GridX)
-    CV_PURE_PROPERTY(int, GridY)
-    CV_PURE_PROPERTY(int, Radius)
-    CV_PURE_PROPERTY(int, Neighbors)
-    CV_PURE_PROPERTY(double, Threshold)
-    CV_PURE_PROPERTY_RO(std::vector<cv::Mat>, Histograms)
-    CV_PURE_PROPERTY_RO(cv::Mat, Labels)
+    /** @see setGridX */
+    virtual int getGridX() const = 0;
+    /** @copybrief getGridX @see getGridX */
+    virtual void setGridX(int val) = 0;
+    /** @see setGridY */
+    virtual int getGridY() const = 0;
+    /** @copybrief getGridY @see getGridY */
+    virtual void setGridY(int val) = 0;
+    /** @see setRadius */
+    virtual int getRadius() const = 0;
+    /** @copybrief getRadius @see getRadius */
+    virtual void setRadius(int val) = 0;
+    /** @see setNeighbors */
+    virtual int getNeighbors() const = 0;
+    /** @copybrief getNeighbors @see getNeighbors */
+    virtual void setNeighbors(int val) = 0;
+    /** @see setThreshold */
+    virtual double getThreshold() const = 0;
+    /** @copybrief getThreshold @see getThreshold */
+    virtual void setThreshold(double val) = 0;
+    virtual std::vector<cv::Mat> getHistograms() const = 0;
+    virtual cv::Mat getLabels() const = 0;
 };
 
 /**

modules/rgbd/include/opencv2/rgbd.hpp

@@ -47,7 +47,7 @@
 namespace cv
 {
 namespace rgbd
-{    
+{
 
 //! @addtogroup rgbd
 //! @{
@@ -150,12 +150,54 @@ namespace rgbd
     void
     initialize() const;
 
-    CV_IMPL_PROPERTY(int, Rows, rows_)
-    CV_IMPL_PROPERTY(int, Cols, cols_)
-    CV_IMPL_PROPERTY(int, WindowSize, window_size_)
-    CV_IMPL_PROPERTY(int, Depth, depth_)
-    CV_IMPL_PROPERTY_S(cv::Mat, K, K_)
-    CV_IMPL_PROPERTY(int, Method, method_)
+    int getRows() const
+    {
+        return rows_;
+    }
+    void setRows(int val)
+    {
+        rows_ = val;
+    }
+    int getCols() const
+    {
+        return cols_;
+    }
+    void setCols(int val)
+    {
+        cols_ = val;
+    }
+    int getWindowSize() const
+    {
+        return window_size_;
+    }
+    void setWindowSize(int val)
+    {
+        window_size_ = val;
+    }
+    int getDepth() const
+    {
+        return depth_;
+    }
+    void setDepth(int val)
+    {
+        depth_ = val;
+    }
+    cv::Mat getK() const
+    {
+        return K_;
+    }
+    void setK(const cv::Mat &val)
+    {
+        K_ = val;
+    }
+    int getMethod() const
+    {
+        return method_;
+    }
+    void setMethod(int val)
+    {
+        method_ = val;
+    }
 
   protected:
     void
@@ -213,9 +255,30 @@ namespace rgbd
     void
     initialize() const;
 
-    CV_IMPL_PROPERTY(int, WindowSize, window_size_)
-    CV_IMPL_PROPERTY(int, Depth, depth_)
-    CV_IMPL_PROPERTY(int, Method, method_)
+    int getWindowSize() const
+    {
+        return window_size_;
+    }
+    void setWindowSize(int val)
+    {
+        window_size_ = val;
+    }
+    int getDepth() const
+    {
+        return depth_;
+    }
+    void setDepth(int val)
+    {
+        depth_ = val;
+    }
+    int getMethod() const
+    {
+        return method_;
+    }
+    void setMethod(int val)
+    {
+        method_ = val;
+    }
 
   protected:
     void
@@ -305,13 +368,62 @@ namespace rgbd
     void
     operator()(InputArray points3d, OutputArray mask, OutputArray plane_coefficients);
 
-    CV_IMPL_PROPERTY(int, BlockSize, block_size_)
-    CV_IMPL_PROPERTY(int, MinSize, min_size_)
-    CV_IMPL_PROPERTY(int, Method, method_)
-    CV_IMPL_PROPERTY(double, Threshold, threshold_)
-    CV_IMPL_PROPERTY(double, SensorErrorA, sensor_error_a_)
-    CV_IMPL_PROPERTY(double, SensorErrorB, sensor_error_b_)
-    CV_IMPL_PROPERTY(double, SensorErrorC, sensor_error_c_)
+    int getBlockSize() const
+    {
+        return block_size_;
+    }
+    void setBlockSize(int val)
+    {
+        block_size_ = val;
+    }
+    int getMinSize() const
+    {
+        return min_size_;
+    }
+    void setMinSize(int val)
+    {
+        min_size_ = val;
+    }
+    int getMethod() const
+    {
+        return method_;
+    }
+    void setMethod(int val)
+    {
+        method_ = val;
+    }
+    double getThreshold() const
+    {
+        return threshold_;
+    }
+    void setThreshold(double val)
+    {
+        threshold_ = val;
+    }
+    double getSensorErrorA() const
+    {
+        return sensor_error_a_;
+    }
+    void setSensorErrorA(double val)
+    {
+        sensor_error_a_ = val;
+    }
+    double getSensorErrorB() const
+    {
+        return sensor_error_b_;
+    }
+    void setSensorErrorB(double val)
+    {
+        sensor_error_b_ = val;
+    }
+    double getSensorErrorC() const
+    {
+        return sensor_error_c_;
+    }
+    void setSensorErrorC(double val)
+    {
+        sensor_error_c_ = val;
+    }
 
   private:
     /** The method to use to compute the planes */
@@ -431,7 +543,7 @@ namespace rgbd
     /** Method to compute a transformation from the source frame to the destination one.
      * Some odometry algorithms do not used some data of frames (eg. ICP does not use images).
      * In such case corresponding arguments can be set as empty Mat.
-     * The method returns true if all internal computions were possible (e.g. there were enough correspondences, 
+     * The method returns true if all internal computions were possible (e.g. there were enough correspondences,
      * system of equations has a solution, etc) and resulting transformation satisfies some test if it's provided
      * by the Odometry inheritor implementation (e.g. thresholds for maximum translation and rotation).
      * @param srcImage Image data of the source frame (CV_8UC1)
@@ -466,16 +578,14 @@ namespace rgbd
 
     static Ptr<Odometry> create(const String & odometryType);
 
-    //TODO: which properties are common for all Odometry successors?
-    CV_PURE_PROPERTY_S(cv::Mat, CameraMatrix)
-//    CV_PURE_PROPERTY(double, MinDepth)
-//    CV_PURE_PROPERTY(double, MaxDepth)
-//    CV_PURE_PROPERTY(double, MaxDepthDiff)
-//    CV_PURE_PROPERTY_S(cv::Mat, IterationCounts)
-//    CV_PURE_PROPERTY(double, MaxPointsPart)
-    CV_PURE_PROPERTY(int, TransformType)
-//    CV_PURE_PROPERTY(double, MaxTranslation)
-//    CV_PURE_PROPERTY(double, MaxRotation)
+    /** @see setCameraMatrix */
+    virtual cv::Mat getCameraMatrix() const = 0;
+    /** @copybrief getCameraMatrix @see getCameraMatrix */
+    virtual void setCameraMatrix(const cv::Mat &val) = 0;
+    /** @see setTransformType */
+    virtual int getTransformType() const = 0;
+    /** @copybrief getTransformType @see getTransformType */
+    virtual void setTransformType(int val) = 0;
 
   protected:
     virtual void
@@ -486,7 +596,7 @@ namespace rgbd
                 const Mat& initRt) const = 0;
   };
 
-  /** Odometry based on the paper "Real-Time Visual Odometry from Dense RGB-D Images", 
+  /** Odometry based on the paper "Real-Time Visual Odometry from Dense RGB-D Images",
    * F. Steinbucker, J. Strum, D. Cremers, ICCV, 2011.
    */
   class CV_EXPORTS RgbdOdometry: public Odometry
@@ -512,16 +622,86 @@ namespace rgbd
 
     virtual Size prepareFrameCache(Ptr<OdometryFrame>& frame, int cacheType) const;
 
-    CV_IMPL_PROPERTY_S(cv::Mat, CameraMatrix, cameraMatrix)
-    CV_IMPL_PROPERTY(double, MinDepth, minDepth)
-    CV_IMPL_PROPERTY(double, MaxDepth, maxDepth)
-    CV_IMPL_PROPERTY(double, MaxDepthDiff, maxDepthDiff)
-    CV_IMPL_PROPERTY_S(cv::Mat, IterationCounts, iterCounts)
-    CV_IMPL_PROPERTY_S(cv::Mat, MinGradientMagnitudes, minGradientMagnitudes)
-    CV_IMPL_PROPERTY(double, MaxPointsPart, maxPointsPart)
-    CV_IMPL_PROPERTY(int, TransformType, transformType)
-    CV_IMPL_PROPERTY(double, MaxTranslation, maxTranslation)
-    CV_IMPL_PROPERTY(double, MaxRotation, maxRotation)
+    cv::Mat getCameraMatrix() const
+    {
+        return cameraMatrix;
+    }
+    void setCameraMatrix(const cv::Mat &val)
+    {
+        cameraMatrix = val;
+    }
+    double getMinDepth() const
+    {
+        return minDepth;
+    }
+    void setMinDepth(double val)
+    {
+        minDepth = val;
+    }
+    double getMaxDepth() const
+    {
+        return maxDepth;
+    }
+    void setMaxDepth(double val)
+    {
+        maxDepth = val;
+    }
+    double getMaxDepthDiff() const
+    {
+        return maxDepthDiff;
+    }
+    void setMaxDepthDiff(double val)
+    {
+        maxDepthDiff = val;
+    }
+    cv::Mat getIterationCounts() const
+    {
+        return iterCounts;
+    }
+    void setIterationCounts(const cv::Mat &val)
+    {
+        iterCounts = val;
+    }
+    cv::Mat getMinGradientMagnitudes() const
+    {
+        return minGradientMagnitudes;
+    }
+    void setMinGradientMagnitudes(const cv::Mat &val)
+    {
+        minGradientMagnitudes = val;
+    }
+    double getMaxPointsPart() const
+    {
+        return maxPointsPart;
+    }
+    void setMaxPointsPart(double val)
+    {
+        maxPointsPart = val;
+    }
+    int getTransformType() const
+    {
+        return transformType;
+    }
+    void setTransformType(int val)
+    {
+        transformType = val;
+    }
+    double getMaxTranslation() const
+    {
+        return maxTranslation;
+    }
+    void setMaxTranslation(double val)
+    {
+        maxTranslation = val;
+    }
+    double getMaxRotation() const
+    {
+        return maxRotation;
+    }
+    void setMaxRotation(double val)
+    {
+        maxRotation = val;
+    }
 
   protected:
     virtual void
@@ -546,7 +726,7 @@ namespace rgbd
     double maxTranslation, maxRotation;
   };
 
-  /** Odometry based on the paper "KinectFusion: Real-Time Dense Surface Mapping and Tracking", 
+  /** Odometry based on the paper "KinectFusion: Real-Time Dense Surface Mapping and Tracking",
    * Richard A. Newcombe, Andrew Fitzgibbon, at al, SIGGRAPH, 2011.
    */
   class ICPOdometry: public Odometry
@@ -569,16 +749,82 @@ namespace rgbd
 
     virtual Size prepareFrameCache(Ptr<OdometryFrame>& frame, int cacheType) const;
 
-    CV_IMPL_PROPERTY_S(cv::Mat, CameraMatrix, cameraMatrix)
-    CV_IMPL_PROPERTY(double, MinDepth, minDepth)
-    CV_IMPL_PROPERTY(double, MaxDepth, maxDepth)
-    CV_IMPL_PROPERTY(double, MaxDepthDiff, maxDepthDiff)
-    CV_IMPL_PROPERTY_S(cv::Mat, IterationCounts, iterCounts)
-    CV_IMPL_PROPERTY(double, MaxPointsPart, maxPointsPart)
-    CV_IMPL_PROPERTY(int, TransformType, transformType)
-    CV_IMPL_PROPERTY(double, MaxTranslation, maxTranslation)
-    CV_IMPL_PROPERTY(double, MaxRotation, maxRotation)
-    CV_IMPL_PROPERTY_RO(Ptr<RgbdNormals>, NormalsComputer, normalsComputer)
+    cv::Mat getCameraMatrix() const
+    {
+        return cameraMatrix;
+    }
+    void setCameraMatrix(const cv::Mat &val)
+    {
+        cameraMatrix = val;
+    }
+    double getMinDepth() const
+    {
+        return minDepth;
+    }
+    void setMinDepth(double val)
+    {
+        minDepth = val;
+    }
+    double getMaxDepth() const
+    {
+        return maxDepth;
+    }
+    void setMaxDepth(double val)
+    {
+        maxDepth = val;
+    }
+    double getMaxDepthDiff() const
+    {
+        return maxDepthDiff;
+    }
+    void setMaxDepthDiff(double val)
+    {
+        maxDepthDiff = val;
+    }
+    cv::Mat getIterationCounts() const
+    {
+        return iterCounts;
+    }
+    void setIterationCounts(const cv::Mat &val)
+    {
+        iterCounts = val;
+    }
+    double getMaxPointsPart() const
+    {
+        return maxPointsPart;
+    }
+    void setMaxPointsPart(double val)
+    {
+        maxPointsPart = val;
+    }
+    int getTransformType() const
+    {
+        return transformType;
+    }
+    void setTransformType(int val)
+    {
+        transformType = val;
+    }
+    double getMaxTranslation() const
+    {
+        return maxTranslation;
+    }
+    void setMaxTranslation(double val)
+    {
+        maxTranslation = val;
+    }
+    double getMaxRotation() const
+    {
+        return maxRotation;
+    }
+    void setMaxRotation(double val)
+    {
+        maxRotation = val;
+    }
+    Ptr<RgbdNormals> getNormalsComputer() const
+    {
+        return normalsComputer;
+    }
 
   protected:
     virtual void
@@ -631,17 +877,90 @@ namespace rgbd
 
     virtual Size prepareFrameCache(Ptr<OdometryFrame>& frame, int cacheType) const;
 
-    CV_IMPL_PROPERTY_S(cv::Mat, CameraMatrix, cameraMatrix)
-    CV_IMPL_PROPERTY(double, MinDepth, minDepth)
-    CV_IMPL_PROPERTY(double, MaxDepth, maxDepth)
-    CV_IMPL_PROPERTY(double, MaxDepthDiff, maxDepthDiff)
-    CV_IMPL_PROPERTY(double, MaxPointsPart, maxPointsPart)
-    CV_IMPL_PROPERTY_S(cv::Mat, IterationCounts, iterCounts)
-    CV_IMPL_PROPERTY_S(cv::Mat, MinGradientMagnitudes, minGradientMagnitudes)
-    CV_IMPL_PROPERTY(int, TransformType, transformType)
-    CV_IMPL_PROPERTY(double, MaxTranslation, maxTranslation)
-    CV_IMPL_PROPERTY(double, MaxRotation, maxRotation)
-    CV_IMPL_PROPERTY_RO(Ptr<RgbdNormals>, NormalsComputer, normalsComputer)
+    cv::Mat getCameraMatrix() const
+    {
+        return cameraMatrix;
+    }
+    void setCameraMatrix(const cv::Mat &val)
+    {
+        cameraMatrix = val;
+    }
+    double getMinDepth() const
+    {
+        return minDepth;
+    }
+    void setMinDepth(double val)
+    {
+        minDepth = val;
+    }
+    double getMaxDepth() const
+    {
+        return maxDepth;
+    }
+    void setMaxDepth(double val)
+    {
+        maxDepth = val;
+    }
+    double getMaxDepthDiff() const
+    {
+        return maxDepthDiff;
+    }
+    void setMaxDepthDiff(double val)
+    {
+        maxDepthDiff = val;
+    }
+    double getMaxPointsPart() const
+    {
+        return maxPointsPart;
+    }
+    void setMaxPointsPart(double val)
+    {
+        maxPointsPart = val;
+    }
+    cv::Mat getIterationCounts() const
+    {
+        return iterCounts;
+    }
+    void setIterationCounts(const cv::Mat &val)
+    {
+        iterCounts = val;
+    }
+    cv::Mat getMinGradientMagnitudes() const
+    {
+        return minGradientMagnitudes;
+    }
+    void setMinGradientMagnitudes(const cv::Mat &val)
+    {
+        minGradientMagnitudes = val;
+    }
+    int getTransformType() const
+    {
+        return transformType;
+    }
+    void setTransformType(int val)
+    {
+        transformType = val;
+    }
+    double getMaxTranslation() const
+    {
+        return maxTranslation;
+    }
+    void setMaxTranslation(double val)
+    {
+        maxTranslation = val;
+    }
+    double getMaxRotation() const
+    {
+        return maxRotation;
+    }
+    void setMaxRotation(double val)
+    {
+        maxRotation = val;
+    }
+    Ptr<RgbdNormals> getNormalsComputer() const
+    {
+        return normalsComputer;
+    }
 
   protected:
     virtual void
@@ -669,8 +988,8 @@ namespace rgbd
     mutable Ptr<RgbdNormals> normalsComputer;
   };
 
-  /** Warp the image: compute 3d points from the depth, transform them using given transformation, 
-   * then project color point cloud to an image plane. 
+  /** Warp the image: compute 3d points from the depth, transform them using given transformation,
+   * then project color point cloud to an image plane.
    * This function can be used to visualize results of the Odometry algorithm.
    * @param image The image (of CV_8UC1 or CV_8UC3 type)
    * @param depth The depth (of type used in depthTo3d fuction)

modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp

@@ -76,8 +76,22 @@ public:
   void read( const FileNode& fn );
   void write( FileStorage& fs ) const;
 
-  CV_IMPL_PROPERTY(int, ImageWidth, resImWidth)
-  CV_IMPL_PROPERTY(int, ImageHeight, resImHeight)
+  int getImageWidth() const
+  {
+    return resImWidth;
+  }
+  inline void setImageWidth(int val)
+  {
+    resImWidth = val;
+  }
+  int getImageHeight() const
+  {
+    return resImHeight;
+  }
+  void setImageHeight(int val)
+  {
+    resImHeight = val;
+  }
 
 protected:
   bool computeSaliencyImpl( const InputArray image, OutputArray saliencyMap );
@@ -114,8 +128,22 @@ public:
   */
   bool init();
 
-  CV_IMPL_PROPERTY(int, ImageWidth, imageWidth)
-  CV_IMPL_PROPERTY(int, ImageHeight, imageHeight)
+  int getImageWidth() const
+  {
+    return imageWidth;
+  }
+  inline void setImageWidth(int val)
+  {
+    imageWidth = val;
+  }
+  int getImageHeight() const
+  {
+    return imageHeight;
+  }
+  void setImageHeight(int val)
+  {
+    imageHeight = val;
+  }
 
 protected:
   /** @brief Performs all the operations and calls all internal functions necessary for the accomplishment of the
@@ -205,9 +233,30 @@ public:
      */
   void setBBResDir( std::string resultsDir );
 
-  CV_IMPL_PROPERTY(double, Base, _base)
-  CV_IMPL_PROPERTY(int, NSS, _NSS)
-  CV_IMPL_PROPERTY(int, W, _W)
+  double getBase() const
+  {
+    return _base;
+  }
+  inline void setBase(double val)
+  {
+    _base = val;
+  }
+  int getNSS() const
+  {
+    return _NSS;
+  }
+  void setNSS(int val)
+  {
+    _NSS = val;
+  }
+  int getW() const
+  {
+    return _W;
+  }
+  void setW(int val)
+  {
+    _W = val;
+  }
 
 protected:
   /** @brief Performs all the operations and calls all internal functions necessary for the

modules/ximgproc/include/opencv2/ximgproc/edge_filter.hpp

@@ -2,26 +2,26 @@
  *  By downloading, copying, installing or using the software you agree to this license.
  *  If you do not agree to this license, do not download, install,
  *  copy or use the software.
- *  
- *  
+ *
+ *
  *  License Agreement
  *  For Open Source Computer Vision Library
  *  (3 - clause BSD License)
- *  
+ *
  *  Redistribution and use in source and binary forms, with or without modification,
  *  are permitted provided that the following conditions are met :
- *  
+ *
  *  *Redistributions of source code must retain the above copyright notice,
  *  this list of conditions and the following disclaimer.
- *  
+ *
  *  * Redistributions in binary form must reproduce the above copyright notice,
  *  this list of conditions and the following disclaimer in the documentation
  *  and / or other materials provided with the distribution.
- *  
+ *
  *  * Neither the names of the copyright holders nor the names of the contributors
  *  may be used to endorse or promote products derived from this software
  *  without specific prior written permission.
- *  
+ *
  *  This software is provided by the copyright holders and contributors "as is" and
  *  any express or implied warranties, including, but not limited to, the implied
  *  warranties of merchantability and fitness for a particular purpose are disclaimed.
@@ -217,12 +217,30 @@ public:
 
     CV_WRAP static Ptr<AdaptiveManifoldFilter> create();
 
-    CV_PURE_PROPERTY(double, SigmaS)
-    CV_PURE_PROPERTY(double, SigmaR)
-    CV_PURE_PROPERTY(int, TreeHeight)
-    CV_PURE_PROPERTY(int, PCAIterations)
-    CV_PURE_PROPERTY(bool, AdjustOutliers)
-    CV_PURE_PROPERTY(bool, UseRNG)
+    /** @see setSigmaS */
+    virtual double getSigmaS() const = 0;
+    /** @copybrief getSigmaS @see getSigmaS */
+    virtual void setSigmaS(double val) = 0;
+    /** @see setSigmaR */
+    virtual double getSigmaR() const = 0;
+    /** @copybrief getSigmaR @see getSigmaR */
+    virtual void setSigmaR(double val) = 0;
+    /** @see setTreeHeight */
+    virtual int getTreeHeight() const = 0;
+    /** @copybrief getTreeHeight @see getTreeHeight */
+    virtual void setTreeHeight(int val) = 0;
+    /** @see setPCAIterations */
+    virtual int getPCAIterations() const = 0;
+    /** @copybrief getPCAIterations @see getPCAIterations */
+    virtual void setPCAIterations(int val) = 0;
+    /** @see setAdjustOutliers */
+    virtual bool getAdjustOutliers() const = 0;
+    /** @copybrief getAdjustOutliers @see getAdjustOutliers */
+    virtual void setAdjustOutliers(bool val) = 0;
+    /** @see setUseRNG */
+    virtual bool getUseRNG() const = 0;
+    /** @copybrief getUseRNG @see getUseRNG */
+    virtual void setUseRNG(bool val) = 0;
 };
 
 /** @brief Factory method, create instance of AdaptiveManifoldFilter and produce some initialization routines.