Merge pull request #1441 from sturkmen72:enable-java

modules/face/CMakeLists.txt

@@ -4,7 +4,7 @@ ocv_define_module(face opencv_core
     opencv_objdetect
     opencv_tracking     # estimateRigidTransform()
     opencv_photo        # samples
-    WRAP python
+    WRAP python java
 )
 # NOTE: objdetect module is needed for one of the samples
 

modules/img_hash/CMakeLists.txt

 set(the_description "Image hash algorithms")
 set(OPENCV_MODULE_IS_PART_OF_WORLD OFF)
-ocv_define_module(img_hash opencv_imgproc opencv_core WRAP java python)
+ocv_define_module(img_hash opencv_imgproc opencv_core WRAP python java)

modules/plot/CMakeLists.txt

 set(the_description "Plot function for Mat data.")
-ocv_define_module(plot opencv_core opencv_imgproc WRAP python)
+ocv_define_module(plot opencv_core opencv_imgproc WRAP python java)

modules/ximgproc/CMakeLists.txt

 set(the_description "Extended image processing module. It includes edge-aware filters and etc.")
-ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_calib3d opencv_imgcodecs WRAP python)
+ocv_define_module(ximgproc opencv_core opencv_imgproc opencv_calib3d opencv_imgcodecs WRAP python java)

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

@@ -44,7 +44,7 @@ namespace ximgproc {
         @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);
+        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.
@@ -53,7 +53,7 @@ namespace ximgproc {
         @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);
+        CV_WRAP void estimateTransformation(InputArray src, InputArray dst, OutputArray alphaPhiST, CV_OUT 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.

modules/xphoto/CMakeLists.txt

 set(the_description "Addon to basic photo module")
-ocv_define_module(xphoto opencv_core opencv_imgproc WRAP python)
+ocv_define_module(xphoto opencv_core opencv_imgproc WRAP python java)