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.

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

Add equidistant distortion model (backport #160) #165

Merged
merged 1 commit into from
Dec 6, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 30, 2021

This is an automatic backport of pull request #160 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

This is a forward-port from ROS1 noetic:

ros/common_msgs#109

The model is based on the following publication:

J. Kannala and S. Brandt (2006). A Generic Camera Model and Calibration
Method for Conventional, Wide-Angle, and Fish-Eye Lenses, IEEE
Transactions on Pattern Analysis and Machine Intelligence, vol. 28, no.
8, pp. 1335-1340

There are many different names for this distortion model:

* Kannala and Brandt call it "Generic Camera Model". Sometimes they also
  call it "equidistance projection model".
* Kalibr calls it "equidistant": https://github.com/ethz-asl/kalibr/wiki/supported-models
* Camodocal calls it "kannala-brandt": https://github.com/hengli/camodocal
* OpenCV calls it "fisheye": https://stackoverflow.com/a/34309644/3036576

All of these are just different names for the same model.

Signed-off-by: Martin Günther <martin.guenther@dfki.de>
(cherry picked from commit f22c436)
@clalancette
Copy link
Contributor

clalancette commented Nov 30, 2021

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@clalancette
Copy link
Contributor

@cottsay Thoughts on backporting this to Galactic?

@clalancette
Copy link
Contributor

Since this is a purely additive patch, and won't change ABI, I'm going to go ahead and merge this for Galactic. If there is some problem with it, we can always revert it before the next patch release.

@clalancette clalancette merged commit b22de2b into galactic Dec 6, 2021
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/galactic/pr-160 branch December 6, 2021 20:51
@mintar
Copy link
Contributor

mintar commented Dec 7, 2021

Great, thanks for merging! Could you create a new release for foxy + galactic? I have a PR for vision_opencv in the pipeline that depends on this change. Once there's a new release of common_interfaces, I can start the (probably) months-long PR process for vision_opencv.

@mintar mintar mentioned this pull request Jan 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants