diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index c4f9940..60fa236 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -12,9 +12,9 @@ on: jobs: cxx-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.0 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.6 python-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.6 secrets: pypi_password: ${{ secrets.pypi_password }} diff --git a/.github/workflows/clang-format-linter.yml b/.github/workflows/clang-format-linter.yml index edfc71e..7d1df4f 100644 --- a/.github/workflows/clang-format-linter.yml +++ b/.github/workflows/clang-format-linter.yml @@ -7,6 +7,8 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master + - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@main + with: + itk-branch: main diff --git a/include/itkContinuousBorderWarpImageFilter.hxx b/include/itkContinuousBorderWarpImageFilter.hxx index 8dbe3c2..7dd1a54 100644 --- a/include/itkContinuousBorderWarpImageFilter.hxx +++ b/include/itkContinuousBorderWarpImageFilter.hxx @@ -72,7 +72,10 @@ ContinuousBorderWarpImageFilter:: } // project point into image region - inputPtr->TransformPhysicalPointToContinuousIndex(point, contIndex); + if (!inputPtr->TransformPhysicalPointToContinuousIndex(point, contIndex)) + { + itkExceptionMacro("Physical point " << point << " is outside the image domain"); + } for (unsigned int j = 0; j < ImageDimension; j++) { diff --git a/include/itkVariationalRegistrationElasticRegularizer.h b/include/itkVariationalRegistrationElasticRegularizer.h index 10bd816..4a5823d 100644 --- a/include/itkVariationalRegistrationElasticRegularizer.h +++ b/include/itkVariationalRegistrationElasticRegularizer.h @@ -189,9 +189,9 @@ class VariationalRegistrationElasticRegularizer : public VariationalRegistration typename FFTWProxyType::PlanType m_PlanForward[ImageDimension]; /** FFT forward plan */ typename FFTWProxyType::PlanType m_PlanBackward[ImageDimension]; /** FFT backward plan */ typename FFTWProxyType::ComplexType * - m_ComplexBuffer[ImageDimension]; /** memory space for output of forward and input of backward FFT*/ - typename FFTWProxyType::PixelType * m_InputBuffer; /** FFT memory space for input data */ - typename FFTWProxyType::PixelType * m_OutputBuffer; /** FFT memory space for output data */ + m_ComplexBuffer[ImageDimension]; /** memory space for output of forward and input of backward FFT*/ + typename FFTWProxyType::PixelType * m_InputBuffer; /** FFT memory space for input data */ + typename FFTWProxyType::PixelType * m_OutputBuffer; /** FFT memory space for output data */ struct ElasticFFTThreadStruct { diff --git a/include/itkVariationalRegistrationFunction.h b/include/itkVariationalRegistrationFunction.h index ceffce4..116605e 100644 --- a/include/itkVariationalRegistrationFunction.h +++ b/include/itkVariationalRegistrationFunction.h @@ -19,7 +19,7 @@ #define itkVariationalRegistrationFunction_h #include "itkFiniteDifferenceFunction.h" -//#include "itkWarpImageFilter.h" +// #include "itkWarpImageFilter.h" #include "itkContinuousBorderWarpImageFilter.h" #include diff --git a/include/itkVariationalRegistrationRegularizer.h b/include/itkVariationalRegistrationRegularizer.h index 5a8d124..32ada97 100644 --- a/include/itkVariationalRegistrationRegularizer.h +++ b/include/itkVariationalRegistrationRegularizer.h @@ -90,7 +90,7 @@ class VariationalRegistrationRegularizer : public InPlaceImageFilterSetStandardDeviations(std::sqrt(regulVar)); regularizer = gaussRegularizer; } break; - case 1: - { + case 1: { DiffusionRegularizerType::Pointer diffRegularizer = DiffusionRegularizerType::New(); diffRegularizer->SetAlpha(regulAlpha); regularizer = diffRegularizer; } break; - case 2: - { + case 2: { #if defined(ITK_USE_FFTWD) || defined(ITK_USE_FFTWF) ElasticRegularizerType::Pointer elasticRegularizer = ElasticRegularizerType::New(); elasticRegularizer->SetMu(regulMu); @@ -748,8 +742,7 @@ main(int argc, char * argv[]) #endif } break; - case 3: - { + case 3: { #if defined(ITK_USE_FFTWD) || defined(ITK_USE_FFTWF) CurvatureRegularizerType::Pointer curvatureRegularizer = CurvatureRegularizerType::New(); curvatureRegularizer->SetAlpha(regulAlpha); @@ -775,20 +768,17 @@ main(int argc, char * argv[]) RegistrationFilterType::Pointer regFilter; switch (searchSpace) { - case 0: - { + case 0: { regFilter = RegistrationFilterType::New(); break; } - case 1: - { + case 1: { DiffeomorphicRegistrationFilterType::Pointer diffeoRegFilter = DiffeomorphicRegistrationFilterType::New(); diffeoRegFilter->SetNumberOfExponentiatorIterations(numberOfExponentiatorIterations); regFilter = diffeoRegFilter; break; } - case 2: - { + case 2: { SymmetricDiffeomorphicRegistrationFilterType::Pointer symmDiffeoRegFilter = SymmetricDiffeomorphicRegistrationFilterType::New(); symmDiffeoRegFilter->SetNumberOfExponentiatorIterations(numberOfExponentiatorIterations); diff --git a/src/itkVariationalRegistrationIncludeRequiredIOFactories.h b/src/itkVariationalRegistrationIncludeRequiredIOFactories.h index e9f2fbc..a4f1558 100644 --- a/src/itkVariationalRegistrationIncludeRequiredIOFactories.h +++ b/src/itkVariationalRegistrationIncludeRequiredIOFactories.h @@ -28,7 +28,7 @@ #include "itkNrrdImageIOFactory.h" #include "itkGiplImageIOFactory.h" #include "itkNiftiImageIOFactory.h" -//#include "itkTestDriverInclude.h" +// #include "itkTestDriverInclude.h" #include "itkObjectFactoryBase.h" void diff --git a/src/win32_compatibility/getopt.c b/src/win32_compatibility/getopt.c index 50e690d..2c74a78 100644 --- a/src/win32_compatibility/getopt.c +++ b/src/win32_compatibility/getopt.c @@ -59,7 +59,9 @@ char * optarg; /* argument associated with option */ * getopt -- * Parse argc/argv argument vector. */ -int getopt(nargc, nargv, ostr) int nargc; +int + getopt(nargc, nargv, ostr) +int nargc; char * const * nargv; const char * ostr; {