Skip to content

COMP: Build against ITK 6 #45

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

Merged
hjmjohnson merged 3 commits into from
Sep 24, 2026
Merged

COMP: Build against ITK 6 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f36ded
COMP: Build against ITK 6
hjmjohnson Sep 21, 2026
71d2161
COMP: Update the reusable CI workflow to a current, tagged release
hjmjohnson Sep 24, 2026
c5142ad
COMP: Point the clang-format lint action at its current branch
hjmjohnson Sep 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-test-package.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ on: [push,pull_request]

jobs:
cxx-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@36e33ec40332bb8fd85bfcd3ee899f82aa108e79
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.4

python-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@36e33ec40332bb8fd85bfcd3ee899f82aa108e79
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.4
secrets:
pypi_password: ${{ secrets.pypi_password }}
4 changes: 2 additions & 2 deletions .github/workflows/clang-format-linter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master
- uses: actions/checkout@v4
- uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@main
with:
error-message: 'Code is inconsistent with ITK Coding Style. Add the *action:ApplyClangFormat* PR label to correct.'
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
cmake_minimum_required(VERSION 3.16.3)
project(StructurePreservingColorNormalization)
set(CMAKE_CXX_STANDARD 14)

if(NOT ITK_SOURCE_DIR)
find_package(ITK REQUIRED)
if(NOT DEFINED CMAKE_CXX_STANDARD AND DEFINED ITK_CXX_STANDARD)
set(CMAKE_CXX_STANDARD ${ITK_CXX_STANDARD})
endif()
list(APPEND CMAKE_MODULE_PATH ${ITK_CMAKE_DIR})
include(ITKModuleExternal)
else()
Expand Down
2 changes: 1 addition & 1 deletion include/itkStructurePreservingColorNormalizationFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ template <typename TImage>
class StructurePreservingColorNormalizationFilter : public ImageToImageFilter<TImage, TImage>
{
public:
ITK_DISALLOW_COPY_AND_ASSIGN(StructurePreservingColorNormalizationFilter);
ITK_DISALLOW_COPY_AND_MOVE(StructurePreservingColorNormalizationFilter);

/** Specific class typedefs */
using ImageType = TImage;
Expand Down
Loading