more error fixes

modules/ximpgroc/include/opencv2/ximpgroc/structured_edge_detection.hpp

@@ -87,10 +87,7 @@ public:
                                      const int gradNum) const = 0;
 };
 
-/*!
-* ...
-*/
-CV_EXPORTS_W Ptr<RFFeatureGetter> createRFFeatureGetter();
+CV_EXPORTS_W Ptr<RFFeatureGetter> createRFFeatureGetter(void);
 
 
 

modules/ximpgroc/src/structured_edge_detection.cpp

@@ -280,8 +280,7 @@ public:
      * \param outNum : __rf.options.numberOfOutputChannels
      * \param gradNum : __rf.options.numberOfGradientOrientations
      */
-    virtual void getFeatures(const cv::Mat &src, NChannelsMat &features,
-                             const int gnrmRad, const int gsmthRad,
+    virtual void getFeatures(const cv::Mat &src, Mat &features, const int gnrmRad, const int gsmthRad,
                              const int shrink, const int outNum, const int gradNum) const
     {
         cv::Mat luvImg = rgb2luv(src);

modules/xphoto/CMakeLists.txt

 set(the_description "Addon to basic photo module")
-ocv_define_module(xphoto opencv_core opencv_imgproc opencv_stitching OPTIONAL opencv_photo opencv_highgui)
+ocv_define_module(xphoto opencv_core opencv_imgproc opencv_photo OPTIONAL opencv_photo opencv_highgui)
\ No newline at end of file

modules/xphoto/src/dct_image_denoising.cpp

@@ -80,7 +80,7 @@ namespace cv
 
     grayDctDenoisingInvoker::grayDctDenoisingInvoker(const Mat &_src, std::vector <Mat> &_patches,
                                                      const double _sigma, const int _psize)
-        : src(_src), patches(_patches), sigma(_sigma), thresh(3*_sigma), psize(_psize) {}
+        : src(_src), patches(_patches), psize(_psize), sigma(_sigma), thresh(3*_sigma) {}
 
     void grayDctDenoisingInvoker::operator() (const Range &range) const
     {

modules/xphoto/test/dct_image_denoising.cpp

@@ -7,7 +7,7 @@ namespace cvtest
         cv::String dir = cvtest::TS::ptr()->get_data_path() + "dct_image_denoising/";
         int nTests = 1;
 
-        float thresholds[] = {0.1};
+        double thresholds[] = {0.1};
 
         int psize[] = {8};
         double sigma[] = {9.0};