'clib3d' support added

diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
index cb353f6..578e4e7 100644 (file)
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@@ -3,8 +3,8 @@
 # ----------------------------------------------------------------------------
 project(opencv_java)
 
-SET(OPENCV_JAVA_MODULES objdetect features2d imgproc video highgui ml core)
-SET(OPENCV_EXTRA_JAVA_MODULES calib3d contrib legacy flann)
+SET(OPENCV_JAVA_MODULES objdetect features2d imgproc video highgui ml core calib3d)
+SET(OPENCV_EXTRA_JAVA_MODULES contrib legacy flann)
 IF(WITH_ANDROID_CAMERA AND NOT BUILD_SHARED_LIBS)
     LIST(APPEND OPENCV_EXTRA_JAVA_MODULES androidcamera)
 ENDIF()

diff --git a/modules/java/gen_java.py b/modules/java/gen_java.py
index e322bf1..f9b291f 100644 (file)
--- a/modules/java/gen_java.py
+++ b/modules/java/gen_java.py
@@ -272,6 +272,37 @@ class JavaWrapperGenerator(object):
             IPL_BORDER_TRANSPARENT = 5;\r
 """ )\r
 \r
+        if module == "calib3d":\r
+            self.java_code.write(\\r
+"""\r
+    public static final int\r
+            CV_LMEDS = 4,\r
+            CV_RANSAC = 8,\r
+            CV_FM_LMEDS = CV_LMEDS,\r
+            CV_FM_RANSAC = CV_RANSAC;\r
+\r
+    public static final int\r
+            CV_FM_7POINT = 1,\r
+            CV_FM_8POINT = 2;\r
+\r
+    public static final int\r
+            CV_CALIB_USE_INTRINSIC_GUESS = 1,\r
+            CV_CALIB_FIX_ASPECT_RATIO = 2,\r
+            CV_CALIB_FIX_PRINCIPAL_POINT = 4,\r
+            CV_CALIB_ZERO_TANGENT_DIST = 8,\r
+            CV_CALIB_FIX_FOCAL_LENGTH = 16,\r
+            CV_CALIB_FIX_K1 = 32,\r
+            CV_CALIB_FIX_K2 = 64,\r
+            CV_CALIB_FIX_K3 = 128,\r
+            CV_CALIB_FIX_K4 = 2048,\r
+            CV_CALIB_FIX_K5 = 4096,\r
+            CV_CALIB_FIX_K6 = 8192,\r
+            CV_CALIB_RATIONAL_MODEL = 16384,\r
+            CV_CALIB_FIX_INTRINSIC = 256,\r
+            CV_CALIB_SAME_FOCAL_LENGTH = 512,\r
+            CV_CALIB_ZERO_DISPARITY = 1024;\r
+""" )\r
+\r
         # java native stuff\r
         self.jn_code.write("""\r
     //\r