From d248eed4eb083ca283be436be0484fe19b7cef8d Mon Sep 17 00:00:00 2001 From: Michael Ferguson Date: Tue, 29 Oct 2024 14:14:49 -0400 Subject: [PATCH] fix merge conflict --- .../src/camera_calibration/calibrator.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/camera_calibration/src/camera_calibration/calibrator.py b/camera_calibration/src/camera_calibration/calibrator.py index efbb87865..2325b4542 100644 --- a/camera_calibration/src/camera_calibration/calibrator.py +++ b/camera_calibration/src/camera_calibration/calibrator.py @@ -1141,16 +1141,6 @@ def cal_fromcorners(self, good): if self.camera_model == CAMERA_MODEL.PINHOLE: print("stereo pinhole calibration...") -<<<<<<< HEAD - if LooseVersion(cv2.__version__).version[0] == 2: - cv2.stereoCalibrate(opts, lipts, ripts, self.size, - self.l.intrinsics, self.l.distortion, - self.r.intrinsics, self.r.distortion, - self.R, # R - self.T, # T - criteria = (cv2.TERM_CRITERIA_EPS + cv2.TERM_CRITERIA_MAX_ITER, 1, 1e-5), - flags = flags) -======= if VersionInfo.parse(cv2.__version__).major < 3: ret_values = cv2.stereoCalibrate(opts, lipts, ripts, self.size, self.l.intrinsics, self.l.distortion, @@ -1160,7 +1150,6 @@ def cal_fromcorners(self, good): criteria=(cv2.TERM_CRITERIA_EPS + \ cv2.TERM_CRITERIA_MAX_ITER, 1, 1e-5), flags=flags) ->>>>>>> efb9005 (Added stereo calibration using charuco board (#976)) else: ret_values = cv2.stereoCalibrate(opts, lipts, ripts, self.l.intrinsics, self.l.distortion,