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

[ROS-O] support ImageMagick 6 and 7 (#31 for noetic) #59

Open
wants to merge 2 commits into
base: noetic-devel
Choose a base branch
from

Conversation

v4hn
Copy link

@v4hn v4hn commented Oct 1, 2022

Port #31 to noetic.
Apparently noetic-devel was split off before #31 was merged, so the same issue comes up again.
This is required to compile sr_movements in RoboStack (e.g., on Ubuntu 22.04).

@biofotis

getConstPixels changed from PixelPacket* to Quantum* in ImageMagick 7,
so use Image::pixelColor instead. This is not as computationally efficient,
but it generalizes between the versions.

Co-authored-by: Beatriz Leon <beatriz@shadowrobot.com>
@v4hn v4hn requested review from a team as code owners October 1, 2022 22:48
Copy link
Contributor

@toliver toliver left a comment

Choose a reason for hiding this comment

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

Do you mind to modify the year in the Copyright note to be:
Copyright 2019, 2022 Shadow Robot Company Ltd. ?

as requested by Toni.
@v4hn
Copy link
Author

v4hn commented Oct 6, 2022

done

@v4hn v4hn changed the title support ImageMagick 6 and 7 (#31 for noetic) [ROS-O] support ImageMagick 6 and 7 (#31 for noetic) Oct 6, 2022
@toliver
Copy link
Contributor

toliver commented Oct 6, 2022

Thank you. We need to sort out an issue with our AWS style_check (probably in the following weeks). We will merge this PR after that.

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