From 209a987cec3a474caa1d1594abb73a1939bb331b Mon Sep 17 00:00:00 2001 From: "Hans J. Johnson" Date: Mon, 10 Nov 2025 13:23:47 -0600 Subject: [PATCH 1/3] COMP: Fix missing header itkImageRegionConstIterator.h BoneMorphometry/include/itkReplaceFeatureMapNanInfImageFilter.h:81:34: error: no template named 'ImageRegionConstIterator' in namespace 'itk' --- include/itkReplaceFeatureMapNanInfImageFilter.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/itkReplaceFeatureMapNanInfImageFilter.h b/include/itkReplaceFeatureMapNanInfImageFilter.h index 1d97fbe..36193dc 100644 --- a/include/itkReplaceFeatureMapNanInfImageFilter.h +++ b/include/itkReplaceFeatureMapNanInfImageFilter.h @@ -21,6 +21,7 @@ #include "itkImageToImageFilter.h" #include "itkNumericTraits.h" #include "itkSimpleDataObjectDecorator.h" +#include "itkImageRegionConstIterator.h" // useful filters #include From 71edfdfeb08fbfaa29893814417e0c438ce50268 Mon Sep 17 00:00:00 2001 From: "Hans J. Johnson" Date: Mon, 10 Nov 2025 13:27:09 -0600 Subject: [PATCH 2/3] COMP: Fix clang-format rules for CI. --- .clang-format | 9 +++++---- .github/workflows/clang-format-linter.yml | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.clang-format b/.clang-format index 45b9502..2fd9142 100644 --- a/.clang-format +++ b/.clang-format @@ -1,4 +1,4 @@ -## This config file is only relevant for clang-format version 19.1.4 +## This config file is only relevant for clang-format version 19.1.7 ## ## Examples of each format style can be found on the in the clang-format documentation ## See: https://clang.llvm.org/docs/ClangFormatStyleOptions.html for details of each option @@ -10,11 +10,11 @@ ## maintaining a consistent code style. ## ## EXAMPLE apply code style enforcement before commit: -# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_19.1.4} --modified +# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_19.1.7} --modified ## EXAMPLE apply code style enforcement after commit: -# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_19.1.4} --last +# Utilities/Maintenance/clang-format.bash --clang ${PATH_TO_CLANG_FORMAT_19.1.7} --last --- -# This configuration requires clang-format version 19.1.4 exactly. +# This configuration requires clang-format version 19.1.7 exactly. Language: Cpp AccessModifierOffset: -2 AlignAfterOpenBracket: Align @@ -297,6 +297,7 @@ StatementMacros: - ITK_CLANG_PRAGMA_PUSH - ITK_CLANG_PRAGMA_POP - ITK_CLANG_SUPPRESS_Wzero_as_null_pointer_constant + - ITK_CLANG_SUPPRESS_Wduplicate_enum - CLANG_PRAGMA_PUSH - CLANG_PRAGMA_POP - CLANG_SUPPRESS_Wfloat_equal diff --git a/.github/workflows/clang-format-linter.yml b/.github/workflows/clang-format-linter.yml index c8e1681..a9d46a7 100644 --- a/.github/workflows/clang-format-linter.yml +++ b/.github/workflows/clang-format-linter.yml @@ -7,9 +7,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 1 - - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master + - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@main with: itk-branch: master From 5d7f8947bf03bc99dd6d469219edc9ab487f7cb0 Mon Sep 17 00:00:00 2001 From: "Hans J. Johnson" Date: Mon, 10 Nov 2025 13:47:01 -0600 Subject: [PATCH 3/3] STYLE: Update clang-format to match ITK 2025-11-10 --- .github/workflows/clang-format-linter.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/clang-format-linter.yml b/.github/workflows/clang-format-linter.yml index a9d46a7..7d1df4f 100644 --- a/.github/workflows/clang-format-linter.yml +++ b/.github/workflows/clang-format-linter.yml @@ -8,8 +8,7 @@ jobs: steps: - uses: actions/checkout@v5 - with: - fetch-depth: 1 + - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@main with: - itk-branch: master + itk-branch: main