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 48cb090..7d1df4f 100644 --- a/.github/workflows/clang-format-linter.yml +++ b/.github/workflows/clang-format-linter.yml @@ -7,9 +7,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master - with: - itk-branch: master + - uses: actions/checkout@v5 + + - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@main with: - error-message: 'Code is inconsistent with ITK Coding Style. Add the *action:ApplyClangFormat* PR label to correct.' + itk-branch: main diff --git a/include/itkVkCommon.h b/include/itkVkCommon.h index 5306f1e..57c7d03 100644 --- a/include/itkVkCommon.h +++ b/include/itkVkCommon.h @@ -81,7 +81,7 @@ class VkFFTBackend_EXPORT VkCommon }; // forward or inverse transformation. (R2HalfH inverse is aka HalfH2R, etc.) NormalizationEnum normalized{ NormalizationEnum::UNNORMALIZED - }; // Whether inverse transformation should be divided by array size + }; // Whether inverse transformation should be divided by array size const void * inputCPUBuffer{ nullptr }; // input buffer in CPU memory uint64_t inputBufferBytes{ 0 }; // number of bytes in inputCPUBuffer void * outputCPUBuffer{ nullptr }; // output buffer in CPU memory