diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index ffdfa24..ba3306a 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -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 }} diff --git a/.github/workflows/clang-format-linter.yml b/.github/workflows/clang-format-linter.yml index ab5019f..7aa066c 100644 --- a/.github/workflows/clang-format-linter.yml +++ b/.github/workflows/clang-format-linter.yml @@ -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.' diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e3884a..ac05eb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/include/itkStructurePreservingColorNormalizationFilter.h b/include/itkStructurePreservingColorNormalizationFilter.h index 7aaba5f..a7ed129 100644 --- a/include/itkStructurePreservingColorNormalizationFilter.h +++ b/include/itkStructurePreservingColorNormalizationFilter.h @@ -74,7 +74,7 @@ template class StructurePreservingColorNormalizationFilter : public ImageToImageFilter { public: - ITK_DISALLOW_COPY_AND_ASSIGN(StructurePreservingColorNormalizationFilter); + ITK_DISALLOW_COPY_AND_MOVE(StructurePreservingColorNormalizationFilter); /** Specific class typedefs */ using ImageType = TImage;