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/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.