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

Add CoordinateType aliases to release 5.4 #5014

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Add CoordinateType aliases to release 5.4 #5014

merged 2 commits into from
Dec 5, 2024

Conversation

N-Dekker
Copy link
Contributor

@N-Dekker N-Dekker commented Dec 4, 2024 •
edited
Loading

Aims to make it easier for users to gradually upgrade their code to ITK 6. Allows them to simply replace their uses of CoordRepType with CoordinateType, without adding #if's to the user code

@github-actions github-actions bot added area:Core Issues affecting the Core module area:Filtering Issues affecting the Filtering module area:IO Issues affecting the IO module area:Registration Issues affecting the Registration module area:Segmentation Issues affecting the Segmentation module labels Dec 4, 2024
@N-Dekker N-Dekker mentioned this pull request Dec 4, 2024
Closed
@N-Dekker N-Dekker marked this pull request as ready for review December 4, 2024 16:55
@hjmjohnson hjmjohnson merged commit be27beb into InsightSoftwareConsortium:release-5.4 Dec 5, 2024
17 checks passed
@blowekamp
Copy link
Member

@hjmjohnson I am try to follow up the steps to complete the release merge outlined here:
https://github.com/InsightSoftwareConsortium/ITK/blob/master/Documentation/docs/contributing/index.md#merge-a-topicmerge-a-topic

The merge into release was completed as described, but the merge into master the following command was issued:
git merge --no-ff -s ours release to resolve the merge to what was currently in master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dzenanz dzenanz dzenanz approved these changes

@hjmjohnson hjmjohnson hjmjohnson approved these changes

Assignees
No one assigned
Labels
area:Core Issues affecting the Core module area:Filtering Issues affecting the Filtering module area:IO Issues affecting the IO module area:Registration Issues affecting the Registration module area:Segmentation Issues affecting the Segmentation module
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@N-Dekker @blowekamp @hjmjohnson @dzenanz