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

[humble] image_publisher: Fix loading of the camera info parameters on startup (backport #983) #996

Merged
merged 2 commits into from
Jun 10, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 29, 2024

As described in #965 camera info is not loaded from the file on node initialization, but only when the parameter is reloaded.

This PR resolves this issue and should be straightforward to port it to Humble, Iron and Jazzy.


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

…on startup (#983)

As described in
#965 camera info
is not loaded from the file on node initialization, but only when the
parameter is reloaded.

This PR resolves this issue and should be straightforward to port it to
`Humble`, `Iron` and `Jazzy`.

(cherry picked from commit 847920b)

# Conflicts:
#	image_publisher/src/image_publisher.cpp
@mergify mergify bot added the conflicts label May 29, 2024
Copy link
Author

mergify bot commented May 29, 2024

Cherry-pick of 847920b has failed:

On branch mergify/bp/humble/pr-983
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 847920b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   image_publisher/src/image_publisher.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ahcorde ahcorde changed the title [rolling] image_publisher: Fix loading of the camera info parameters on startup (backport #983) [humble] image_publisher: Fix loading of the camera info parameters on startup (backport #983) May 29, 2024
Copy link
Member

@mikeferguson mikeferguson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed merge issue - waiting on CI

@mikeferguson mikeferguson merged commit 1860ddc into humble Jun 10, 2024
3 checks passed
@mikeferguson mikeferguson deleted the mergify/bp/humble/pr-983 branch June 10, 2024 13:04
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