fix merge conflict

ros-perception · Oct 29, 2024 · d248eed · d248eed
1 parent 547a1a8
commit d248eed
Showing 1 changed file with 0 additions and 11 deletions.
diff --git 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,