Skip to content

Fix new opencv aruco api (backport #1072) #1074

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

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2025

This fix is based on ros/meta-ros@719fe6e. I have not found any matching PR here. This also fixes compiling for jazzy.


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

This fix is based on
ros/meta-ros@719fe6e.
I have not found any matching PR here. This also fixes compiling for
jazzy.

(cherry picked from commit 8cc46a3)

# Conflicts:
#	image_proc/src/track_marker.cpp
@mergify mergify bot added the conflicts label Feb 12, 2025
Copy link
Contributor Author

mergify bot commented Feb 12, 2025

Cherry-pick of 8cc46a3 has failed:

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

You are currently cherry-picking commit 8cc46a3.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   image_proc/src/track_marker.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

@mergify mergify bot mentioned this pull request Feb 12, 2025
@ahcorde ahcorde closed this Feb 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants