Fuzzy module optimization.

whitespace cleanup

test - possible fix

test update

modules/fuzzy/include/opencv2/fuzzy/fuzzy_F0_math.hpp

@@ -54,7 +54,7 @@ namespace ft
     //! @{
 
     /** @brief Computes components of the array using direct F0-transform.
-    @param matrix Input 1-channel array.
+    @param matrix Input array.
     @param kernel Kernel used for processing. Function **createKernel** can be used.
     @param components Output 32-bit array for the components.
     @param mask Mask can be used for unwanted area marking.
@@ -64,10 +64,10 @@ namespace ft
     @note
         F-transform technique is described in paper @cite Perf:FT.
      */
-    CV_EXPORTS void FT02D_components(InputArray matrix, InputArray kernel, OutputArray components, InputArray mask);
+    CV_EXPORTS_AS(FT02D_components1) void FT02D_components(InputArray matrix, InputArray kernel, OutputArray components, InputArray mask);
 
     /** @brief Computes components of the array using direct F0-transform.
-    @param matrix Input 1-channel array.
+    @param matrix Input array.
     @param kernel Kernel used for processing. Function **createKernel** can be used.
     @param components Output 32-bit array for the components.
 
@@ -76,10 +76,10 @@ namespace ft
     @note
         F-transform technique is described in paper @cite Perf:FT.
      */
-    CV_EXPORTS void FT02D_components(InputArray matrix, InputArray kernel, OutputArray components);
+    CV_EXPORTS_W void FT02D_components(InputArray matrix, InputArray kernel, OutputArray components);
 
     /** @brief Computes inverse F0-transfrom.
-    @param components Input 32-bit array for the components.
+    @param components Input 32-bit single channel array for the components.
     @param kernel Kernel used for processing. Function **createKernel** can be used.
     @param output Output 32-bit array.
     @param width Width of the output array.
@@ -88,29 +88,38 @@ namespace ft
     @note
         F-transform technique is described in paper @cite Perf:FT.
      */
-    CV_EXPORTS void FT02D_inverseFT(InputArray components, InputArray kernel, OutputArray output, int width, int height);
+    CV_EXPORTS_W void FT02D_inverseFT(InputArray components, InputArray kernel, OutputArray output, int width, int height);
 
     /** @brief Computes F0-transfrom and inverse F0-transfrom at once.
-    @param image Input image.
+    @param matrix Input matrix.
     @param kernel Kernel used for processing. Function **createKernel** can be used.
     @param output Output 32-bit array.
     @param mask Mask used for unwanted area marking.
 
     This function computes F-transfrom and inverse F-transfotm in one step. It is fully sufficient and optimized for **Mat**.
     */
-    CV_EXPORTS void FT02D_process(const Mat &image, const Mat &kernel, Mat &output, const Mat &mask);
+    CV_EXPORTS_AS(FT02D_process1) void FT02D_process(InputArray matrix, InputArray kernel, OutputArray output, InputArray mask);
+
+    /** @brief Computes F0-transfrom and inverse F0-transfrom at once.
+    @param matrix Input matrix.
+    @param kernel Kernel used for processing. Function **createKernel** can be used.
+    @param output Output 32-bit array.
+
+    This function computes F-transfrom and inverse F-transfotm in one step. It is fully sufficient and optimized for **Mat**.
+    */
+    CV_EXPORTS_W void FT02D_process(InputArray matrix, InputArray kernel, OutputArray output);
 
     /** @brief Computes F0-transfrom and inverse F0-transfrom at once and return state.
-    @param image Input image.
+    @param matrix Input matrix.
     @param kernel Kernel used for processing. Function **createKernel** can be used.
-    @param imageOutput Output 32-bit array.
+    @param output Output 32-bit array.
     @param mask Mask used for unwanted area marking.
     @param maskOutput Mask after one iteration.
     @param firstStop If **true** function returns -1 when first problem appears. In case of **false**, the process is completed and summation of all problems returned.
 
     This function computes iteration of F-transfrom and inverse F-transfotm and handle image and mask change. The function is used in *inpaint* function.
     */
-    CV_EXPORTS int FT02D_iteration(const Mat &image, const Mat &kernel, Mat &imageOutput, const Mat &mask, Mat &maskOutput, bool firstStop = true);
+    CV_EXPORTS_W int FT02D_iteration(InputArray matrix, InputArray kernel, OutputArray output, InputArray mask, OutputArray maskOutput, bool firstStop);
 
     //! @}
 }

modules/fuzzy/include/opencv2/fuzzy/fuzzy_image.hpp

@@ -61,7 +61,7 @@ namespace ft
 
     The function creates kernel usable for latter fuzzy image processing.
     */
-    CV_EXPORTS void createKernel(cv::InputArray A, cv::InputArray B, cv::OutputArray kernel, const int chn = 1);
+    CV_EXPORTS_AS(createKernel1) void createKernel(InputArray A, InputArray B, OutputArray kernel, const int chn);
 
     /** @brief Creates kernel from general functions.
     @param function Function type could be one of the following:
@@ -72,7 +72,7 @@ namespace ft
 
     The function creates kernel from predefined functions.
     */
-    CV_EXPORTS void createKernel(int function, int radius, cv::OutputArray kernel, const int chn = 1);
+    CV_EXPORTS_W void createKernel(int function, int radius, OutputArray kernel, const int chn);
 
     /** @brief Image inpainting
     @param image Input image.
@@ -91,16 +91,16 @@ namespace ft
     @note
         The algorithms are described in paper @cite Perf:rec.
     */
-    CV_EXPORTS void inpaint(const cv::Mat &image, const cv::Mat &mask, cv::Mat &output, int radius = 2, int function = ft::LINEAR, int algorithm = ft::ONE_STEP);
+    CV_EXPORTS_W void inpaint(InputArray image, InputArray mask, OutputArray output, int radius, int function, int algorithm);
 
     /** @brief Image filtering
     @param image Input image.
-    @param kernel Final 32-b kernel.
+    @param kernel Final 32-bit kernel.
     @param output Output 32-bit image.
 
     Filtering of the input image by means of F-transform.
     */
-    CV_EXPORTS void filter(const cv::Mat &image, const cv::Mat &kernel, cv::Mat &output);
+    CV_EXPORTS_W void filter(InputArray image, InputArray kernel, OutputArray output);
 
     //! @}
 }