Skip to content

Commit 6f8c3b1

Browse files
authored
Merge pull request opencv#26437 from vrabaud:4x_calibration_base
Backport C++ stereo/stereo_geom.cpp:5.x to calib3d/stereo_geom.cpp:4.x opencv#26437 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake
1 parent 3fddea2 commit 6f8c3b1

File tree

8 files changed

+721
-988
lines changed

8 files changed

+721
-988
lines changed

modules/calib3d/src/calib3d_c_api.h

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,6 @@ extern "C" {
5555
* Camera Calibration, Pose Estimation and Stereo *
5656
\****************************************************************************************/
5757

58-
void cvConvertPointsHomogeneous( const CvMat* src, CvMat* dst );
59-
60-
/* For each input point on one of images
61-
computes parameters of the corresponding
62-
epipolar line on the other image */
63-
void cvComputeCorrespondEpilines( const CvMat* points,
64-
int which_image,
65-
const CvMat* fundamental_matrix,
66-
CvMat* correspondent_lines );
67-
6858
/* Finds perspective transformation between the object plane and image (view) plane */
6959
int cvFindHomography( const CvMat* src_points,
7060
const CvMat* dst_points,
@@ -97,51 +87,6 @@ double cvCalibrateCamera2( const CvMat* object_points,
9787
CvTermCriteria term_crit CV_DEFAULT(cvTermCriteria(
9888
CV_TERMCRIT_ITER+CV_TERMCRIT_EPS,30,DBL_EPSILON)) );
9989

100-
/* Computes the transformation from one camera coordinate system to another one
101-
from a few correspondent views of the same calibration target. Optionally, calibrates
102-
both cameras */
103-
double cvStereoCalibrate( const CvMat* object_points, const CvMat* image_points1,
104-
const CvMat* image_points2, const CvMat* npoints,
105-
CvMat* camera_matrix1, CvMat* dist_coeffs1,
106-
CvMat* camera_matrix2, CvMat* dist_coeffs2,
107-
CvSize image_size, CvMat* R, CvMat* T,
108-
CvMat* E CV_DEFAULT(0), CvMat* F CV_DEFAULT(0),
109-
int flags CV_DEFAULT(CV_CALIB_FIX_INTRINSIC),
110-
CvTermCriteria term_crit CV_DEFAULT(cvTermCriteria(
111-
CV_TERMCRIT_ITER+CV_TERMCRIT_EPS,30,1e-6)) );
112-
113-
#define CV_CALIB_ZERO_DISPARITY 1024
114-
115-
/* Computes 3D rotations (+ optional shift) for each camera coordinate system to make both
116-
views parallel (=> to make all the epipolar lines horizontal or vertical) */
117-
void cvStereoRectify( const CvMat* camera_matrix1, const CvMat* camera_matrix2,
118-
const CvMat* dist_coeffs1, const CvMat* dist_coeffs2,
119-
CvSize image_size, const CvMat* R, const CvMat* T,
120-
CvMat* R1, CvMat* R2, CvMat* P1, CvMat* P2,
121-
CvMat* Q CV_DEFAULT(0),
122-
int flags CV_DEFAULT(CV_CALIB_ZERO_DISPARITY),
123-
double alpha CV_DEFAULT(-1),
124-
CvSize new_image_size CV_DEFAULT(cvSize(0,0)),
125-
CvRect* valid_pix_ROI1 CV_DEFAULT(0),
126-
CvRect* valid_pix_ROI2 CV_DEFAULT(0));
127-
128-
/* Computes rectification transformations for uncalibrated pair of images using a set
129-
of point correspondences */
130-
int cvStereoRectifyUncalibrated( const CvMat* points1, const CvMat* points2,
131-
const CvMat* F, CvSize img_size,
132-
CvMat* H1, CvMat* H2,
133-
double threshold CV_DEFAULT(5));
134-
135-
/** @brief Computes the original (undistorted) feature coordinates
136-
from the observed (distorted) coordinates
137-
@see cv::undistortPoints
138-
*/
139-
void cvUndistortPoints( const CvMat* src, CvMat* dst,
140-
const CvMat* camera_matrix,
141-
const CvMat* dist_coeffs,
142-
const CvMat* R CV_DEFAULT(0),
143-
const CvMat* P CV_DEFAULT(0));
144-
14590
#ifdef __cplusplus
14691
} // extern "C"
14792
#endif

0 commit comments

Comments
 (0)