From 6b112b2f19a9245b35153358824276370d293cdb Mon Sep 17 00:00:00 2001 From: ds58 <30220598+ds58@users.noreply.github.com> Date: Thu, 16 Feb 2023 15:33:56 -0600 Subject: [PATCH 3/3] Rename all opencv cv::fisheye functions --- .../opencv/global/opencv_calib3d.java | 106 +++++++++++------- .../opencv/presets/opencv_calib3d.java | 29 ++++- 2 files changed, 88 insertions(+), 47 deletions(-) diff --git a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_calib3d.java b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_calib3d.java index f00d53c76f8..f19a7520213 100644 --- a/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_calib3d.java +++ b/opencv/src/gen/java/org/bytedeco/opencv/global/opencv_calib3d.java @@ -4988,26 +4988,32 @@ The function can be used for both a stereo camera head or a monocular camera (wh image points coordinates (as functions of all the input parameters) with respect to the particular parameters, intrinsic and/or extrinsic. */ - @Namespace("cv::fisheye") public static native void projectPoints(@ByVal Mat objectPoints, @ByVal Mat imagePoints, @Const @ByRef Mat affine, + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal Mat objectPoints, @ByVal Mat imagePoints, @Const @ByRef Mat affine, @ByVal Mat K, @ByVal Mat D, double alpha/*=0*/, @ByVal(nullValue = "cv::OutputArray(cv::noArray())") Mat jacobian); - @Namespace("cv::fisheye") public static native void projectPoints(@ByVal Mat objectPoints, @ByVal Mat imagePoints, @Const @ByRef Mat affine, + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal Mat objectPoints, @ByVal Mat imagePoints, @Const @ByRef Mat affine, @ByVal Mat K, @ByVal Mat D); - @Namespace("cv::fisheye") public static native void projectPoints(@ByVal UMat objectPoints, @ByVal UMat imagePoints, @Const @ByRef Mat affine, + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal UMat objectPoints, @ByVal UMat imagePoints, @Const @ByRef Mat affine, @ByVal UMat K, @ByVal UMat D, double alpha/*=0*/, @ByVal(nullValue = "cv::OutputArray(cv::noArray())") UMat jacobian); - @Namespace("cv::fisheye") public static native void projectPoints(@ByVal UMat objectPoints, @ByVal UMat imagePoints, @Const @ByRef Mat affine, + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal UMat objectPoints, @ByVal UMat imagePoints, @Const @ByRef Mat affine, @ByVal UMat K, @ByVal UMat D); - @Namespace("cv::fisheye") public static native void projectPoints(@ByVal GpuMat objectPoints, @ByVal GpuMat imagePoints, @Const @ByRef Mat affine, + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal GpuMat objectPoints, @ByVal GpuMat imagePoints, @Const @ByRef Mat affine, @ByVal GpuMat K, @ByVal GpuMat D, double alpha/*=0*/, @ByVal(nullValue = "cv::OutputArray(cv::noArray())") GpuMat jacobian); - @Namespace("cv::fisheye") public static native void projectPoints(@ByVal GpuMat objectPoints, @ByVal GpuMat imagePoints, @Const @ByRef Mat affine, + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal GpuMat objectPoints, @ByVal GpuMat imagePoints, @Const @ByRef Mat affine, @ByVal GpuMat K, @ByVal GpuMat D); /** \overload */ - @Namespace("cv::fisheye") public static native void projectPoints(@ByVal Mat objectPoints, @ByVal Mat imagePoints, @ByVal Mat rvec, @ByVal Mat tvec, + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal Mat objectPoints, @ByVal Mat imagePoints, @ByVal Mat rvec, @ByVal Mat tvec, @ByVal Mat K, @ByVal Mat D, double alpha/*=0*/, @ByVal(nullValue = "cv::OutputArray(cv::noArray())") Mat jacobian); - @Namespace("cv::fisheye") public static native void projectPoints(@ByVal UMat objectPoints, @ByVal UMat imagePoints, @ByVal UMat rvec, @ByVal UMat tvec, + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal Mat objectPoints, @ByVal Mat imagePoints, @ByVal Mat rvec, @ByVal Mat tvec, + @ByVal Mat K, @ByVal Mat D); + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal UMat objectPoints, @ByVal UMat imagePoints, @ByVal UMat rvec, @ByVal UMat tvec, @ByVal UMat K, @ByVal UMat D, double alpha/*=0*/, @ByVal(nullValue = "cv::OutputArray(cv::noArray())") UMat jacobian); - @Namespace("cv::fisheye") public static native void projectPoints(@ByVal GpuMat objectPoints, @ByVal GpuMat imagePoints, @ByVal GpuMat rvec, @ByVal GpuMat tvec, + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal UMat objectPoints, @ByVal UMat imagePoints, @ByVal UMat rvec, @ByVal UMat tvec, + @ByVal UMat K, @ByVal UMat D); + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal GpuMat objectPoints, @ByVal GpuMat imagePoints, @ByVal GpuMat rvec, @ByVal GpuMat tvec, @ByVal GpuMat K, @ByVal GpuMat D, double alpha/*=0*/, @ByVal(nullValue = "cv::OutputArray(cv::noArray())") GpuMat jacobian); + @Namespace("cv::fisheye") public static native @Name("projectPoints") void fisheyeProjectPoints(@ByVal GpuMat objectPoints, @ByVal GpuMat imagePoints, @ByVal GpuMat rvec, @ByVal GpuMat tvec, + @ByVal GpuMat K, @ByVal GpuMat D); /** \brief Distorts 2D points using fisheye model.
@@ -5021,12 +5027,12 @@ image points coordinates (as functions of all the input parameters) with respect Note that the function assumes the camera intrinsic matrix of the undistorted points to be identity. This means if you want to distort image points you have to multiply them with {@code K^{-1}}. */ - @Namespace("cv::fisheye") public static native void distortPoints(@ByVal Mat undistorted, @ByVal Mat distorted, @ByVal Mat K, @ByVal Mat D, double alpha/*=0*/); - @Namespace("cv::fisheye") public static native void distortPoints(@ByVal Mat undistorted, @ByVal Mat distorted, @ByVal Mat K, @ByVal Mat D); - @Namespace("cv::fisheye") public static native void distortPoints(@ByVal UMat undistorted, @ByVal UMat distorted, @ByVal UMat K, @ByVal UMat D, double alpha/*=0*/); - @Namespace("cv::fisheye") public static native void distortPoints(@ByVal UMat undistorted, @ByVal UMat distorted, @ByVal UMat K, @ByVal UMat D); - @Namespace("cv::fisheye") public static native void distortPoints(@ByVal GpuMat undistorted, @ByVal GpuMat distorted, @ByVal GpuMat K, @ByVal GpuMat D, double alpha/*=0*/); - @Namespace("cv::fisheye") public static native void distortPoints(@ByVal GpuMat undistorted, @ByVal GpuMat distorted, @ByVal GpuMat K, @ByVal GpuMat D); + @Namespace("cv::fisheye") public static native @Name("distortPoints") void fisheyeDistortPoints(@ByVal Mat undistorted, @ByVal Mat distorted, @ByVal Mat K, @ByVal Mat D, double alpha/*=0*/); + @Namespace("cv::fisheye") public static native @Name("distortPoints") void fisheyeDistortPoints(@ByVal Mat undistorted, @ByVal Mat distorted, @ByVal Mat K, @ByVal Mat D); + @Namespace("cv::fisheye") public static native @Name("distortPoints") void fisheyeDistortPoints(@ByVal UMat undistorted, @ByVal UMat distorted, @ByVal UMat K, @ByVal UMat D, double alpha/*=0*/); + @Namespace("cv::fisheye") public static native @Name("distortPoints") void fisheyeDistortPoints(@ByVal UMat undistorted, @ByVal UMat distorted, @ByVal UMat K, @ByVal UMat D); + @Namespace("cv::fisheye") public static native @Name("distortPoints") void fisheyeDistortPoints(@ByVal GpuMat undistorted, @ByVal GpuMat distorted, @ByVal GpuMat K, @ByVal GpuMat D, double alpha/*=0*/); + @Namespace("cv::fisheye") public static native @Name("distortPoints") void fisheyeDistortPoints(@ByVal GpuMat undistorted, @ByVal GpuMat distorted, @ByVal GpuMat K, @ByVal GpuMat D); /** \brief Undistorts 2D points using fisheye model
@@ -5040,15 +5046,21 @@ image points coordinates (as functions of all the input parameters) with respect
@param criteria Termination criteria
@param undistorted Output array of image points, 1xN/Nx1 2-channel, or vector\
*/
- @Namespace("cv::fisheye") public static native void undistortImage(@ByVal Mat distorted, @ByVal Mat undistorted,
+ @Namespace("cv::fisheye") public static native @Name("undistortImage") void fisheyeUndistortImage(@ByVal Mat distorted, @ByVal Mat undistorted,
@ByVal Mat K, @ByVal Mat D, @ByVal(nullValue = "cv::InputArray(cv::noArray())") Mat Knew, @Const @ByRef(nullValue = "cv::Size()") Size new_size);
- @Namespace("cv::fisheye") public static native void undistortImage(@ByVal Mat distorted, @ByVal Mat undistorted,
+ @Namespace("cv::fisheye") public static native @Name("undistortImage") void fisheyeUndistortImage(@ByVal Mat distorted, @ByVal Mat undistorted,
@ByVal Mat K, @ByVal Mat D);
- @Namespace("cv::fisheye") public static native void undistortImage(@ByVal UMat distorted, @ByVal UMat undistorted,
+ @Namespace("cv::fisheye") public static native @Name("undistortImage") void fisheyeUndistortImage(@ByVal UMat distorted, @ByVal UMat undistorted,
@ByVal UMat K, @ByVal UMat D, @ByVal(nullValue = "cv::InputArray(cv::noArray())") UMat Knew, @Const @ByRef(nullValue = "cv::Size()") Size new_size);
- @Namespace("cv::fisheye") public static native void undistortImage(@ByVal UMat distorted, @ByVal UMat undistorted,
+ @Namespace("cv::fisheye") public static native @Name("undistortImage") void fisheyeUndistortImage(@ByVal UMat distorted, @ByVal UMat undistorted,
@ByVal UMat K, @ByVal UMat D);
- @Namespace("cv::fisheye") public static native void undistortImage(@ByVal GpuMat distorted, @ByVal GpuMat undistorted,
+ @Namespace("cv::fisheye") public static native @Name("undistortImage") void fisheyeUndistortImage(@ByVal GpuMat distorted, @ByVal GpuMat undistorted,
@ByVal GpuMat K, @ByVal GpuMat D, @ByVal(nullValue = "cv::InputArray(cv::noArray())") GpuMat Knew, @Const @ByRef(nullValue = "cv::Size()") Size new_size);
- @Namespace("cv::fisheye") public static native void undistortImage(@ByVal GpuMat distorted, @ByVal GpuMat undistorted,
+ @Namespace("cv::fisheye") public static native @Name("undistortImage") void fisheyeUndistortImage(@ByVal GpuMat distorted, @ByVal GpuMat undistorted,
@ByVal GpuMat K, @ByVal GpuMat D);
/** \brief Estimates new camera intrinsic matrix for undistortion or rectification.
@@ -5125,17 +5137,17 @@ image points coordinates (as functions of all the input parameters) with respect
@param new_size the new size
@param fov_scale Divisor for new focal length.
*/
- @Namespace("cv::fisheye") public static native void estimateNewCameraMatrixForUndistortRectify(@ByVal Mat K, @ByVal Mat D, @Const @ByRef Size image_size, @ByVal Mat R,
+ @Namespace("cv::fisheye") public static native @Name("estimateNewCameraMatrixForUndistortRectify") void fisheyeEstimateNewCameraMatrixForUndistortRectify(@ByVal Mat K, @ByVal Mat D, @Const @ByRef Size image_size, @ByVal Mat R,
@ByVal Mat P, double balance/*=0.0*/, @Const @ByRef(nullValue = "cv::Size()") Size new_size, double fov_scale/*=1.0*/);
- @Namespace("cv::fisheye") public static native void estimateNewCameraMatrixForUndistortRectify(@ByVal Mat K, @ByVal Mat D, @Const @ByRef Size image_size, @ByVal Mat R,
+ @Namespace("cv::fisheye") public static native @Name("estimateNewCameraMatrixForUndistortRectify") void fisheyeEstimateNewCameraMatrixForUndistortRectify(@ByVal Mat K, @ByVal Mat D, @Const @ByRef Size image_size, @ByVal Mat R,
@ByVal Mat P);
- @Namespace("cv::fisheye") public static native void estimateNewCameraMatrixForUndistortRectify(@ByVal UMat K, @ByVal UMat D, @Const @ByRef Size image_size, @ByVal UMat R,
+ @Namespace("cv::fisheye") public static native @Name("estimateNewCameraMatrixForUndistortRectify") void fisheyeEstimateNewCameraMatrixForUndistortRectify(@ByVal UMat K, @ByVal UMat D, @Const @ByRef Size image_size, @ByVal UMat R,
@ByVal UMat P, double balance/*=0.0*/, @Const @ByRef(nullValue = "cv::Size()") Size new_size, double fov_scale/*=1.0*/);
- @Namespace("cv::fisheye") public static native void estimateNewCameraMatrixForUndistortRectify(@ByVal UMat K, @ByVal UMat D, @Const @ByRef Size image_size, @ByVal UMat R,
+ @Namespace("cv::fisheye") public static native @Name("estimateNewCameraMatrixForUndistortRectify") void fisheyeEstimateNewCameraMatrixForUndistortRectify(@ByVal UMat K, @ByVal UMat D, @Const @ByRef Size image_size, @ByVal UMat R,
@ByVal UMat P);
- @Namespace("cv::fisheye") public static native void estimateNewCameraMatrixForUndistortRectify(@ByVal GpuMat K, @ByVal GpuMat D, @Const @ByRef Size image_size, @ByVal GpuMat R,
+ @Namespace("cv::fisheye") public static native @Name("estimateNewCameraMatrixForUndistortRectify") void fisheyeEstimateNewCameraMatrixForUndistortRectify(@ByVal GpuMat K, @ByVal GpuMat D, @Const @ByRef Size image_size, @ByVal GpuMat R,
@ByVal GpuMat P, double balance/*=0.0*/, @Const @ByRef(nullValue = "cv::Size()") Size new_size, double fov_scale/*=1.0*/);
- @Namespace("cv::fisheye") public static native void estimateNewCameraMatrixForUndistortRectify(@ByVal GpuMat K, @ByVal GpuMat D, @Const @ByRef Size image_size, @ByVal GpuMat R,
+ @Namespace("cv::fisheye") public static native @Name("estimateNewCameraMatrixForUndistortRectify") void fisheyeEstimateNewCameraMatrixForUndistortRectify(@ByVal GpuMat K, @ByVal GpuMat D, @Const @ByRef Size image_size, @ByVal GpuMat R,
@ByVal GpuMat P);
/** \brief Performs camera calibration
@@ -5173,15 +5185,15 @@ image points coordinates (as functions of all the input parameters) with respect
optimization. It is the {@code max(width,height)/\pi} or the provided {@code f_x}, {@code f_y} when \ref fisheye::CALIB_USE_INTRINSIC_GUESS is set too.
@param criteria Termination criteria for the iterative optimization algorithm.
*/
- @Namespace("cv::fisheye") public static native double calibrate(@ByVal MatVector objectPoints, @ByVal MatVector imagePoints, @Const @ByRef Size image_size,
+ @Namespace("cv::fisheye") public static native @Name("calibrate") double fisheyeCalibrate(@ByVal MatVector objectPoints, @ByVal MatVector imagePoints, @Const @ByRef Size image_size,
@ByVal Mat K, @ByVal Mat D, @ByVal MatVector rvecs, @ByVal MatVector tvecs, int flags/*=0*/,
@ByVal(nullValue = "cv::TermCriteria(cv::TermCriteria::COUNT + cv::TermCriteria::EPS, 100, DBL_EPSILON)") TermCriteria criteria);
- @Namespace("cv::fisheye") public static native double calibrate(@ByVal MatVector objectPoints, @ByVal MatVector imagePoints, @Const @ByRef Size image_size,
+ @Namespace("cv::fisheye") public static native @Name("calibrate") double fisheyeCalibrate(@ByVal MatVector objectPoints, @ByVal MatVector imagePoints, @Const @ByRef Size image_size,
@ByVal Mat K, @ByVal Mat D, @ByVal MatVector rvecs, @ByVal MatVector tvecs);
- @Namespace("cv::fisheye") public static native double calibrate(@ByVal Point3fVectorVector objectPoints, @ByVal Point2fVectorVector imagePoints, @Const @ByRef Size image_size,
+ @Namespace("cv::fisheye") public static native @Name("calibrate") double fisheyeCalibrate(@ByVal Point3fVectorVector objectPoints, @ByVal Point2fVectorVector imagePoints, @Const @ByRef Size image_size,
@ByVal Mat K, @ByVal Mat D, @ByVal MatVector rvecs, @ByVal MatVector tvecs, int flags/*=0*/,
@ByVal(nullValue = "cv::TermCriteria(cv::TermCriteria::COUNT + cv::TermCriteria::EPS, 100, DBL_EPSILON)") TermCriteria criteria);
- @Namespace("cv::fisheye") public static native double calibrate(@ByVal Point3fVectorVector objectPoints, @ByVal Point2fVectorVector imagePoints, @Const @ByRef Size image_size,
+ @Namespace("cv::fisheye") public static native @Name("calibrate") double fisheyeCalibrate(@ByVal Point3fVectorVector objectPoints, @ByVal Point2fVectorVector imagePoints, @Const @ByRef Size image_size,
@ByVal Mat K, @ByVal Mat D, @ByVal MatVector rvecs, @ByVal MatVector tvecs);
/** \brief Stereo rectification for fisheye camera model
@@ -5214,20 +5226,20 @@ is passed (default), it is set to the original imageSize . Setting it to larger
length. Balance is in range of [0, 1].
@param fov_scale Divisor for new focal length.
*/
- @Namespace("cv::fisheye") public static native void stereoRectify(@ByVal Mat K1, @ByVal Mat D1, @ByVal Mat K2, @ByVal Mat D2, @Const @ByRef Size imageSize, @ByVal Mat R, @ByVal Mat tvec,
+ @Namespace("cv::fisheye") public static native @Name("stereoRectify") void fisheyeStereoRectify(@ByVal Mat K1, @ByVal Mat D1, @ByVal Mat K2, @ByVal Mat D2, @Const @ByRef Size imageSize, @ByVal Mat R, @ByVal Mat tvec,
@ByVal Mat R1, @ByVal Mat R2, @ByVal Mat P1, @ByVal Mat P2, @ByVal Mat Q, int flags, @Const @ByRef(nullValue = "cv::Size()") Size newImageSize,
double balance/*=0.0*/, double fov_scale/*=1.0*/);
- @Namespace("cv::fisheye") public static native void stereoRectify(@ByVal Mat K1, @ByVal Mat D1, @ByVal Mat K2, @ByVal Mat D2, @Const @ByRef Size imageSize, @ByVal Mat R, @ByVal Mat tvec,
+ @Namespace("cv::fisheye") public static native @Name("stereoRectify") void fisheyeStereoRectify(@ByVal Mat K1, @ByVal Mat D1, @ByVal Mat K2, @ByVal Mat D2, @Const @ByRef Size imageSize, @ByVal Mat R, @ByVal Mat tvec,
@ByVal Mat R1, @ByVal Mat R2, @ByVal Mat P1, @ByVal Mat P2, @ByVal Mat Q, int flags);
- @Namespace("cv::fisheye") public static native void stereoRectify(@ByVal UMat K1, @ByVal UMat D1, @ByVal UMat K2, @ByVal UMat D2, @Const @ByRef Size imageSize, @ByVal UMat R, @ByVal UMat tvec,
+ @Namespace("cv::fisheye") public static native @Name("stereoRectify") void fisheyeStereoRectify(@ByVal UMat K1, @ByVal UMat D1, @ByVal UMat K2, @ByVal UMat D2, @Const @ByRef Size imageSize, @ByVal UMat R, @ByVal UMat tvec,
@ByVal UMat R1, @ByVal UMat R2, @ByVal UMat P1, @ByVal UMat P2, @ByVal UMat Q, int flags, @Const @ByRef(nullValue = "cv::Size()") Size newImageSize,
double balance/*=0.0*/, double fov_scale/*=1.0*/);
- @Namespace("cv::fisheye") public static native void stereoRectify(@ByVal UMat K1, @ByVal UMat D1, @ByVal UMat K2, @ByVal UMat D2, @Const @ByRef Size imageSize, @ByVal UMat R, @ByVal UMat tvec,
+ @Namespace("cv::fisheye") public static native @Name("stereoRectify") void fisheyeStereoRectify(@ByVal UMat K1, @ByVal UMat D1, @ByVal UMat K2, @ByVal UMat D2, @Const @ByRef Size imageSize, @ByVal UMat R, @ByVal UMat tvec,
@ByVal UMat R1, @ByVal UMat R2, @ByVal UMat P1, @ByVal UMat P2, @ByVal UMat Q, int flags);
- @Namespace("cv::fisheye") public static native void stereoRectify(@ByVal GpuMat K1, @ByVal GpuMat D1, @ByVal GpuMat K2, @ByVal GpuMat D2, @Const @ByRef Size imageSize, @ByVal GpuMat R, @ByVal GpuMat tvec,
+ @Namespace("cv::fisheye") public static native @Name("stereoRectify") void fisheyeStereoRectify(@ByVal GpuMat K1, @ByVal GpuMat D1, @ByVal GpuMat K2, @ByVal GpuMat D2, @Const @ByRef Size imageSize, @ByVal GpuMat R, @ByVal GpuMat tvec,
@ByVal GpuMat R1, @ByVal GpuMat R2, @ByVal GpuMat P1, @ByVal GpuMat P2, @ByVal GpuMat Q, int flags, @Const @ByRef(nullValue = "cv::Size()") Size newImageSize,
double balance/*=0.0*/, double fov_scale/*=1.0*/);
- @Namespace("cv::fisheye") public static native void stereoRectify(@ByVal GpuMat K1, @ByVal GpuMat D1, @ByVal GpuMat K2, @ByVal GpuMat D2, @Const @ByRef Size imageSize, @ByVal GpuMat R, @ByVal GpuMat tvec,
+ @Namespace("cv::fisheye") public static native @Name("stereoRectify") void fisheyeStereoRectify(@ByVal GpuMat K1, @ByVal GpuMat D1, @ByVal GpuMat K2, @ByVal GpuMat D2, @Const @ByRef Size imageSize, @ByVal GpuMat R, @ByVal GpuMat tvec,
@ByVal GpuMat R1, @ByVal GpuMat R2, @ByVal GpuMat P1, @ByVal GpuMat P2, @ByVal GpuMat Q, int flags);
/** \brief Performs stereo calibration
@@ -5271,10 +5283,20 @@ of previous output parameter ( rvecs ).
zero.
@param criteria Termination criteria for the iterative optimization algorithm.
*/
-
+ @Namespace("cv::fisheye") public static native @Name("stereoCalibrate") double fisheyeStereoCalibrate(@ByVal Point3fVectorVector objectPoints,
+ @ByVal Point2fVectorVector imagePoints1, @ByVal Point2fVectorVector imagePoints2,
+ @ByVal Mat K1, @ByVal Mat D1,
+ @ByVal Mat K2, @ByVal Mat D2,
+ @ByVal Size imageSize, @ByVal Mat R, @ByVal Mat T,
+ int flags/*=cv::fisheye::CALIB_FIX_INTRINSIC*/,
+ @ByVal(nullValue = "cv::TermCriteria(cv::TermCriteria::COUNT + cv::TermCriteria::EPS, 100, DBL_EPSILON)") TermCriteria criteria);
+ @Namespace("cv::fisheye") public static native @Name("stereoCalibrate") double fisheyeStereoCalibrate(@ByVal Point3fVectorVector objectPoints,
+ @ByVal Point2fVectorVector imagePoints1, @ByVal Point2fVectorVector imagePoints2,
+ @ByVal Mat K1, @ByVal Mat D1,
+ @ByVal Mat K2, @ByVal Mat D2,
+ @ByVal Size imageSize, @ByVal Mat R, @ByVal Mat T);
/** \overload */
-
/** \} calib3d_fisheye */
// end namespace fisheye
diff --git a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java
index 3940453b27c..d0548447803 100644
--- a/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java
+++ b/opencv/src/main/java/org/bytedeco/opencv/presets/opencv_calib3d.java
@@ -151,18 +151,37 @@ public void map(InfoMap infoMap) {
.put(new Info("cv::fisheye::CALIB_FIX_PRINCIPAL_POINT").javaNames("FISHEYE_CALIB_FIX_PRINCIPAL_POINT").translate())
.put(new Info("cv::fisheye::CALIB_ZERO_DISPARITY").javaNames("FISHEYE_CALIB_ZERO_DISPARITY").translate())
.put(new Info("cv::fisheye::CALIB_FIX_FOCAL_LENGTH").javaNames("FISHEYE_CALIB_FIX_FOCAL_LENGTH").translate())
- .put(new Info("cv::fisheye::initUndistortRectifyMap").javaNames("fisheyeInitUndistortRectifyMap"))
.put(new Info("cv::fisheye::calibrate").javaText(
- "@Namespace(\"cv::fisheye\") public static native double calibrate(@ByVal MatVector objectPoints, @ByVal MatVector imagePoints, @Const @ByRef Size image_size,\n"
+ "@Namespace(\"cv::fisheye\") public static native @Name(\"calibrate\") double fisheyeCalibrate(@ByVal MatVector objectPoints, @ByVal MatVector imagePoints, @Const @ByRef Size image_size,\n"
+ " @ByVal Mat K, @ByVal Mat D, @ByVal MatVector rvecs, @ByVal MatVector tvecs, int flags/*=0*/,\n"
+ " @ByVal(nullValue = \"cv::TermCriteria(cv::TermCriteria::COUNT + cv::TermCriteria::EPS, 100, DBL_EPSILON)\") TermCriteria criteria);\n"
- + "@Namespace(\"cv::fisheye\") public static native double calibrate(@ByVal MatVector objectPoints, @ByVal MatVector imagePoints, @Const @ByRef Size image_size,\n"
+ + "@Namespace(\"cv::fisheye\") public static native @Name(\"calibrate\") double fisheyeCalibrate(@ByVal MatVector objectPoints, @ByVal MatVector imagePoints, @Const @ByRef Size image_size,\n"
+ " @ByVal Mat K, @ByVal Mat D, @ByVal MatVector rvecs, @ByVal MatVector tvecs);\n"
- + "@Namespace(\"cv::fisheye\") public static native double calibrate(@ByVal Point3fVectorVector objectPoints, @ByVal Point2fVectorVector imagePoints, @Const @ByRef Size image_size,\n"
+ + "@Namespace(\"cv::fisheye\") public static native @Name(\"calibrate\") double fisheyeCalibrate(@ByVal Point3fVectorVector objectPoints, @ByVal Point2fVectorVector imagePoints, @Const @ByRef Size image_size,\n"
+ " @ByVal Mat K, @ByVal Mat D, @ByVal MatVector rvecs, @ByVal MatVector tvecs, int flags/*=0*/,\n"
+ " @ByVal(nullValue = \"cv::TermCriteria(cv::TermCriteria::COUNT + cv::TermCriteria::EPS, 100, DBL_EPSILON)\") TermCriteria criteria);\n"
- + "@Namespace(\"cv::fisheye\") public static native double calibrate(@ByVal Point3fVectorVector objectPoints, @ByVal Point2fVectorVector imagePoints, @Const @ByRef Size image_size,\n"
+ + "@Namespace(\"cv::fisheye\") public static native @Name(\"calibrate\") double fisheyeCalibrate(@ByVal Point3fVectorVector objectPoints, @ByVal Point2fVectorVector imagePoints, @Const @ByRef Size image_size,\n"
+ " @ByVal Mat K, @ByVal Mat D, @ByVal MatVector rvecs, @ByVal MatVector tvecs);\n"))
+ .put(new Info("cv::fisheye::distortPoints").javaNames("fisheyeDistortPoints"))
+ .put(new Info("cv::fisheye::estimateNewCameraMatrixForUndistortRectify").javaNames("fisheyeEstimateNewCameraMatrixForUndistortRectify"))
+ .put(new Info("cv::fisheye::initUndistortRectifyMap").javaNames("fisheyeInitUndistortRectifyMap"))
+ .put(new Info("cv::fisheye::projectPoints").javaNames("fisheyeProjectPoints"))
+ .put(new Info("cv::fisheye::stereoCalibrate").javaText(
+ "@Namespace(\"cv::fisheye\") public static native @Name(\"stereoCalibrate\") double fisheyeStereoCalibrate(@ByVal Point3fVectorVector objectPoints,\n"
+ + " @ByVal Point2fVectorVector imagePoints1, @ByVal Point2fVectorVector imagePoints2,\n"
+ + " @ByVal Mat K1, @ByVal Mat D1,\n"
+ + " @ByVal Mat K2, @ByVal Mat D2,\n"
+ + " @ByVal Size imageSize, @ByVal Mat R, @ByVal Mat T,\n"
+ + " int flags/*=cv::fisheye::CALIB_FIX_INTRINSIC*/,\n"
+ + " @ByVal(nullValue = \"cv::TermCriteria(cv::TermCriteria::COUNT + cv::TermCriteria::EPS, 100, DBL_EPSILON)\") TermCriteria criteria);\n"
+ + "@Namespace(\"cv::fisheye\") public static native @Name(\"stereoCalibrate\") double fisheyeStereoCalibrate(@ByVal Point3fVectorVector objectPoints,\n"
+ + " @ByVal Point2fVectorVector imagePoints1, @ByVal Point2fVectorVector imagePoints2,\n"
+ + " @ByVal Mat K1, @ByVal Mat D1,\n"
+ + " @ByVal Mat K2, @ByVal Mat D2,\n"
+ + " @ByVal Size imageSize, @ByVal Mat R, @ByVal Mat T);\n"))
+ .put(new Info("cv::fisheye::stereoRectify").javaNames("fisheyeStereoRectify"))
+ .put(new Info("cv::fisheye::undistortImage").javaNames("fisheyeUndistortImage"))
+ .put(new Info("cv::fisheye::undistortPoints").javaNames("fisheyeUndistortPoints"))
.put(new Info("Affine3d").pointerTypes("Mat"));
}
}