Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace disutils with python3-semver #970

Merged
merged 1 commit into from
Apr 23, 2024
Merged

replace disutils with python3-semver #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions camera_calibration/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<depend>rclpy</depend>
<depend>std_srvs</depend>
<depend>sensor_msgs</depend>
<depend>python3-semver</depend>

<test_depend>ament_copyright</test_depend>
<test_depend>ament_flake8</test_depend>
Expand Down
6 changes: 3 additions & 3 deletions camera_calibration/src/camera_calibration/calibrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
import sys
import tarfile
import time
from distutils.version import LooseVersion
from semver import VersionInfo
from enum import Enum

# Supported camera models
Expand Down Expand Up @@ -1145,7 +1145,7 @@ def cal_fromcorners(self, good):

if self.camera_model == CAMERA_MODEL.PINHOLE:
print("stereo pinhole calibration...")
if LooseVersion(cv2.__version__).version[0] == 2:
if VersionInfo.parse(cv2.__version__).major < 3:
cv2.stereoCalibrate(opts, lipts, ripts, self.size,
self.l.intrinsics, self.l.distortion,
self.r.intrinsics, self.r.distortion,
Expand All @@ -1164,7 +1164,7 @@ def cal_fromcorners(self, good):
flags = flags)
elif self.camera_model == CAMERA_MODEL.FISHEYE:
print("stereo fisheye calibration...")
if LooseVersion(cv2.__version__).version[0] == 2:
if VersionInfo.parse(cv2.__version__).major < 3:
print("ERROR: You need OpenCV >3 to use fisheye camera model")
sys.exit()
else:
Expand Down
Loading