From b5d864f57972d2b35f6128066cab830d87a759a1 Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Mon, 11 Jul 2011 08:33:12 +0000 Subject: [PATCH] 'clib3d' support added --- modules/java/CMakeLists.txt | 4 ++-- modules/java/gen_java.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt index cb353f6..578e4e7 100644 --- 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 --- a/modules/java/gen_java.py +++ b/modules/java/gen_java.py @@ -272,6 +272,37 @@ class JavaWrapperGenerator(object): IPL_BORDER_TRANSPARENT = 5; """ ) + if module == "calib3d": + self.java_code.write(\ +""" + public static final int + CV_LMEDS = 4, + CV_RANSAC = 8, + CV_FM_LMEDS = CV_LMEDS, + CV_FM_RANSAC = CV_RANSAC; + + public static final int + CV_FM_7POINT = 1, + CV_FM_8POINT = 2; + + public static final int + CV_CALIB_USE_INTRINSIC_GUESS = 1, + CV_CALIB_FIX_ASPECT_RATIO = 2, + CV_CALIB_FIX_PRINCIPAL_POINT = 4, + CV_CALIB_ZERO_TANGENT_DIST = 8, + CV_CALIB_FIX_FOCAL_LENGTH = 16, + CV_CALIB_FIX_K1 = 32, + CV_CALIB_FIX_K2 = 64, + CV_CALIB_FIX_K3 = 128, + CV_CALIB_FIX_K4 = 2048, + CV_CALIB_FIX_K5 = 4096, + CV_CALIB_FIX_K6 = 8192, + CV_CALIB_RATIONAL_MODEL = 16384, + CV_CALIB_FIX_INTRINSIC = 256, + CV_CALIB_SAME_FOCAL_LENGTH = 512, + CV_CALIB_ZERO_DISPARITY = 1024; +""" ) + # java native stuff self.jn_code.write(""" // -- 2.7.4