review

modules/ximgproc/include/opencv2/ximgproc.hpp

@@ -70,7 +70,7 @@ i.e. algorithms which somehow takes into account pixel affinities in natural ima
 
     @defgroup ximgproc_fast_line_detector Fast line detector
 
-    @defgroup ximgproc_shape Fourier descriptors
+    @defgroup ximgproc_fourier Fourier descriptors
     @}
 */
 

modules/ximgproc/include/opencv2/ximgproc/fourier_descriptors.hpp

@@ -8,112 +8,112 @@
 #include <opencv2/core.hpp>
 
 namespace cv {
-    namespace ximgproc {
+namespace ximgproc {
 
-        //! @addtogroup ximgproc_shape
-        //! @{
+    //! @addtogroup ximgproc_fourier
+    //! @{
 
-        /** @brief Class for ContourFitting algorithms.
-        ContourFitting match two contours \f$ z_a \f$ and \f$ z_b \f$ minimizing distance
-        \f[ d(z_a,z_b)=\sum (a_n - s  b_n e^{j(n \alpha +\phi )})^2 \f] where \f$ a_n \f$ and \f$ b_n \f$ are Fourier descriptors of \f$ z_a \f$ and \f$ z_b \f$ and s is a scaling factor and  \f$ \phi \f$ is angle rotation and \f$ \alpha \f$ is starting point factor adjustement
-        */
-        class CV_EXPORTS_W ContourFitting : public Algorithm
-        {
-            int ctrSize;
-            int fdSize;
-            std::vector<std::complex<double> > b;
-            std::vector<std::complex<double> > a;
-            std::vector<double> frequence;
-            std::vector<double> rho, psi;
-            void frequencyInit();
-            void fAlpha(double x, double &fn, double &df);
-            double distance(std::complex<double> r, double alpha);
-            double  newtonRaphson(double x1, double x2);
-        public:
-            /** @brief Fit two closed curves using fourier descriptors. More details in @cite PersoonFu1977 and @cite BergerRaghunathan1998
+    /** @brief Class for ContourFitting algorithms.
+    ContourFitting match two contours \f$ z_a \f$ and \f$ z_b \f$ minimizing distance
+    \f[ d(z_a,z_b)=\sum (a_n - s  b_n e^{j(n \alpha +\phi )})^2 \f] where \f$ a_n \f$ and \f$ b_n \f$ are Fourier descriptors of \f$ z_a \f$ and \f$ z_b \f$ and s is a scaling factor and  \f$ \phi \f$ is angle rotation and \f$ \alpha \f$ is starting point factor adjustement
+    */
+    class CV_EXPORTS_W ContourFitting : public Algorithm
+    {
+        int ctrSize;
+        int fdSize;
+        std::vector<std::complex<double> > b;
+        std::vector<std::complex<double> > a;
+        std::vector<double> frequence;
+        std::vector<double> rho, psi;
+        void frequencyInit();
+        void fAlpha(double x, double &fn, double &df);
+        double distance(std::complex<double> r, double alpha);
+        double  newtonRaphson(double x1, double x2);
+    public:
+        /** @brief Fit two closed curves using fourier descriptors. More details in @cite PersoonFu1977 and @cite BergerRaghunathan1998
 
-            * @param ctr number of Fourier descriptors equal to number of contour points after resampling.
-            * @param fd Contour defining second shape (Target).
-            */
-            ContourFitting(int ctr=1024,int fd=16):ctrSize(ctr),fdSize(fd){};
-            /** @brief Fit two closed curves using fourier descriptors. More details in @cite PersoonFu1977 and @cite BergerRaghunathan1998
+        * @param ctr number of Fourier descriptors equal to number of contour points after resampling.
+        * @param fd Contour defining second shape (Target).
+        */
+        ContourFitting(int ctr=1024,int fd=16):ctrSize(ctr),fdSize(fd){};
+        /** @brief Fit two closed curves using fourier descriptors. More details in @cite PersoonFu1977 and @cite BergerRaghunathan1998
 
-            @param src Contour defining first shape.
-            @param dst Contour defining second shape (Target).
-            @param _alphaPhiST : \f$ \alpha \f$=_alphaPhiST(0,0), \f$ \phi \f$=_alphaPhiST(0,1) (in radian), s=_alphaPhiST(0,2), Tx=_alphaPhiST(0,3), Ty=_alphaPhiST(0,4) rotation center
-            @param dist distance between src and dst after matching.
-            @param fdContour false then src and dst are contours and true src and dst are fourier descriptors.
-            */
-            CV_WRAP void estimateTransformation(InputArray src, InputArray dst, OutputArray _alphaPhiST, double *dist = 0, bool fdContour = false);
-            /** @brief Fit two closed curves using fourier descriptors. More details in @cite PersoonFu1977 and @cite BergerRaghunathan1998
+        @param src Contour defining first shape.
+        @param dst Contour defining second shape (Target).
+        @param alphaPhiST : \f$ \alpha \f$=alphaPhiST(0,0), \f$ \phi \f$=alphaPhiST(0,1) (in radian), s=alphaPhiST(0,2), Tx=alphaPhiST(0,3), Ty=alphaPhiST(0,4) rotation center
+        @param dist distance between src and dst after matching.
+        @param fdContour false then src and dst are contours and true src and dst are fourier descriptors.
+        */
+        CV_WRAP void estimateTransformation(InputArray src, InputArray dst, OutputArray alphaPhiST, double *dist = 0, bool fdContour = false);
+        /** @brief Fit two closed curves using fourier descriptors. More details in @cite PersoonFu1977 and @cite BergerRaghunathan1998
 
-            @param src Contour defining first shape.
-            @param dst Contour defining second shape (Target).
-            @param _alphaPhiST : \f$ \alpha \f$=_alphaPhiST(0,0), \f$ \phi \f$=_alphaPhiST(0,1) (in radian), s=_alphaPhiST(0,2), Tx=_alphaPhiST(0,3), Ty=_alphaPhiST(0,4) rotation center
-            @param dist distance between src and dst after matching.
-            @param fdContour false then src and dst are contours and true src and dst are fourier descriptors.
-            */
-            CV_WRAP void estimateTransformation(InputArray src, InputArray dst, OutputArray _alphaPhiST, double &dist , bool fdContour = false);
-            /** @brief set number of Fourier descriptors used in estimateTransformation
+        @param src Contour defining first shape.
+        @param dst Contour defining second shape (Target).
+        @param alphaPhiST : \f$ \alpha \f$=alphaPhiST(0,0), \f$ \phi \f$=alphaPhiST(0,1) (in radian), s=alphaPhiST(0,2), Tx=alphaPhiST(0,3), Ty=alphaPhiST(0,4) rotation center
+        @param dist distance between src and dst after matching.
+        @param fdContour false then src and dst are contours and true src and dst are fourier descriptors.
+        */
+        CV_WRAP void estimateTransformation(InputArray src, InputArray dst, OutputArray alphaPhiST, double &dist , bool fdContour = false);
+        /** @brief set number of Fourier descriptors used in estimateTransformation
 
-            @param n number of Fourier descriptors equal to number of contour points after resampling.
-            */
-            CV_WRAP void setCtrSize(int n);
-            /** @brief set number of Fourier descriptors when estimateTransformation used vector<Point>
+        @param n number of Fourier descriptors equal to number of contour points after resampling.
+        */
+        CV_WRAP void setCtrSize(int n);
+        /** @brief set number of Fourier descriptors when estimateTransformation used vector<Point>
 
-            @param n number of fourier descriptors used for optimal curve matching.
-            */
-            CV_WRAP void setFDSize(int n);
-            /**
-            @returns number of fourier descriptors
-            */
-            CV_WRAP int getCtrSize() { return ctrSize; };
-            /**
-            @returns number of fourier descriptors used for optimal curve matching
-            */
-            CV_WRAP int getFDSize() { return fdSize; };
-        };
-        /**
-        * @brief   Fourier descriptors for planed closed curves
-        *
-        * For more details about this implementation, please see @cite PersoonFu1977
-        *
-        * @param   _src   contour type vector<Point> , vector<Point2f>  or vector<Point2d>
-        * @param   _dst   Mat of type CV_64FC2 and nbElt rows A VERIFIER
-        * @param   nbElt number of rows in _dst or getOptimalDFTSize rows if nbElt=-1
-        * @param   nbFD number of FD return in _dst _dst = [FD(1...nbFD/2) FD(nbFD/2-nbElt+1...:nbElt)]
-        *
+        @param n number of fourier descriptors used for optimal curve matching.
         */
-        CV_EXPORTS_W void fourierDescriptor(InputArray _src, OutputArray _dst, int nbElt=-1,int nbFD=-1);
+        CV_WRAP void setFDSize(int n);
         /**
-        * @brief   transform a contour
-        *
-        * @param   _src   contour or Fourier Descriptors if fd is true
-        * @param   _t   transform Mat given by estimateTransformation
-        * @param   _dst   Mat of type CV_64FC2 and nbElt rows
-        * @param   fdContour true _src are Fourier Descriptors. fdContour false _src is a contour
-        *
+        @returns number of fourier descriptors
         */
-        CV_EXPORTS_W void transform(InputArray _src, InputArray _t,OutputArray _dst, bool fdContour=true);
+        CV_WRAP int getCtrSize() { return ctrSize; };
         /**
-        * @brief   Contour sampling .
-        *
-        * @param   _src   contour type vector<Point> , vector<Point2f>  or vector<Point2d>
-        * @param   _out   Mat of type CV_64FC2 and nbElt rows
-        * @param   nbElt number of points in _out contour
-        *
+        @returns number of fourier descriptors used for optimal curve matching
         */
-        CV_EXPORTS_W void contourSampling(InputArray _src, OutputArray _out, int nbElt);
+        CV_WRAP int getFDSize() { return fdSize; };
+    };
+    /**
+    * @brief   Fourier descriptors for planed closed curves
+    *
+    * For more details about this implementation, please see @cite PersoonFu1977
+    *
+    * @param   src   contour type vector<Point> , vector<Point2f>  or vector<Point2d>
+    * @param   dst   Mat of type CV_64FC2 and nbElt rows A VERIFIER
+    * @param   nbElt number of rows in dst or getOptimalDFTSize rows if nbElt=-1
+    * @param   nbFD number of FD return in dst dst = [FD(1...nbFD/2) FD(nbFD/2-nbElt+1...:nbElt)]
+    *
+    */
+    CV_EXPORTS_W void fourierDescriptor(InputArray src, OutputArray dst, int nbElt=-1,int nbFD=-1);
+    /**
+    * @brief   transform a contour
+    *
+    * @param   src   contour or Fourier Descriptors if fd is true
+    * @param   t   transform Mat given by estimateTransformation
+    * @param   dst   Mat of type CV_64FC2 and nbElt rows
+    * @param   fdContour true src are Fourier Descriptors. fdContour false src is a contour
+    *
+    */
+    CV_EXPORTS_W void transform(InputArray src, InputArray t,OutputArray dst, bool fdContour=true);
+    /**
+    * @brief   Contour sampling .
+    *
+    * @param   src   contour type vector<Point> , vector<Point2f>  or vector<Point2d>
+    * @param   out   Mat of type CV_64FC2 and nbElt rows
+    * @param   nbElt number of points in out contour
+    *
+    */
+    CV_EXPORTS_W void contourSampling(InputArray src, OutputArray out, int nbElt);
 
-        /**
-        * @brief create
+    /**
+    * @brief create
 
-        * @param ctr number of Fourier descriptors equal to number of contour points after resampling.
-        * @param fd Contour defining second shape (Target).
-        */
-        CV_EXPORTS_W Ptr<ContourFitting> create(int ctr = 1024, int fd = 16);
+    * @param ctr number of Fourier descriptors equal to number of contour points after resampling.
+    * @param fd Contour defining second shape (Target).
+    */
+    CV_EXPORTS_W Ptr<ContourFitting> create(int ctr = 1024, int fd = 16);
 
-        //! @} ximgproc_shape
-    }
+    //! @} ximgproc_fourier
+}
 }
 #endif

modules/ximgproc/samples/fourier_descriptors_demo.cpp

-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-
 #include <opencv2/core.hpp>
 #include <opencv2/core/utility.hpp>
 #include <opencv2/highgui.hpp>
@@ -58,10 +54,10 @@ int main(void)
     double dist;
     vector<vector<Point> > c;
     Mat img;
-    cout << "******************** PRESS G TO MATCH CURVES *************\n";
+    cout << "******************** PRESS g TO MATCH CURVES *************\n";
     do
     {
-        code = waitKey(30)&0xFF;
+        code = waitKey(30);
         if (p.update)
         {
             Mat r = getRotationMatrix2D(Point(p.xg, p.yg), p.angle, 10.0/ p.scale10);

modules/ximgproc/src/fourier_descriptors.cpp

@@ -13,7 +13,7 @@ Coalescence in 2 dimensions: experiments on thin copolymer films and numerical s
 */
 
 namespace cv {
-    namespace ximgproc {
+namespace ximgproc {
 
 
 void ContourFitting::setCtrSize(int n)