From 150da41473c71271412a6bf179e68d9384f55640 Mon Sep 17 00:00:00 2001 From: VXL Maintainers Date: Sun, 16 Nov 2025 08:18:43 -0600 Subject: [PATCH 1/3] VXL 2025-11-16 (3096fc83) Code extracted from: https://github.com/vxl/vxl.git at commit 3096fc83b3e5dc1c958e421e99defcb935d9b70b (master). --- Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_complex_traits.h | 2 +- Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_math.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_complex_traits.h b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_complex_traits.h index 060e199c2ec..5be898b6265 100644 --- a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_complex_traits.h +++ b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_complex_traits.h @@ -206,7 +206,7 @@ struct VNL_EXPORT vnl_complex_traits> isreal = false }; static std::complex - conjugate(std::complex x) + conjugate(std::complex /* x */) { throw std::runtime_error("Can not call complexify on non floating point data type"); return std::complex(0., 0.); diff --git a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_math.h b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_math.h index e8fcb4895e8..ca8ca09156c 100644 --- a/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_math.h +++ b/Modules/ThirdParty/VNL/src/vxl/core/vnl/vnl_math.h @@ -147,7 +147,7 @@ angle_minuspi_to_pi(double angle); namespace vnl_math { #if defined(_MSC_VER) -// MSVC does not properly implement isfinite, iinf, isnan for C++11 conformance for integral types +// MSVC does not properly implement isfinite, isinf, isnan for C++11 conformance for integral types // For integral types only: template _Check_return_ typename std::enable_if::value, bool>::type From 2d7b402e6230a13fab5a863bf10db647bf38b34b Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Sun, 16 Nov 2025 12:49:04 +0100 Subject: [PATCH 2/3] STYLE: Remove `itk::Index` variables from region initialization in tests Removed `constexpr itk::Index` variables initialized by zero's, that were only there as the index argument of a region initialization. Follow-up to pull request https://github.com/InsightSoftwareConsortium/ITK/pull/5627 commit f9885d27a08b7a94448591777908404821de6623 "STYLE: Remove `T::IndexType index{}` from region initialization in tests" --- .../Core/Common/test/itkAdaptorComparisonTest.cxx | 5 ++--- .../Common/test/itkConstNeighborhoodIteratorTest.cxx | 4 +--- ...itkConstNeighborhoodIteratorWithOnlyIndexTest.cxx | 4 +--- .../test/itkMinimumMaximumImageCalculatorTest.cxx | 3 +-- Modules/Core/Common/test/itkSliceIteratorTest.cxx | 7 +++---- .../ImageFilterBase/test/itkCastImageFilterTest.cxx | 12 ++++-------- .../test/itkReadWriteSpatialObjectTest.cxx | 5 +---- 7 files changed, 13 insertions(+), 27 deletions(-) diff --git a/Modules/Core/Common/test/itkAdaptorComparisonTest.cxx b/Modules/Core/Common/test/itkAdaptorComparisonTest.cxx index a011370ea76..dd25edc1d19 100644 --- a/Modules/Core/Common/test/itkAdaptorComparisonTest.cxx +++ b/Modules/Core/Common/test/itkAdaptorComparisonTest.cxx @@ -170,9 +170,8 @@ itkAdaptorComparisonTest(int, char *[]) using VectorImageType = itk::Image, 3>; // Set up some images - constexpr itk::Size<3> size{ 100, 100, 100 }; - constexpr itk::Index<3> index{ 0, 0, 0 }; - itk::ImageRegion<3> region = { index, size }; + constexpr itk::Size<3> size{ 100, 100, 100 }; + itk::ImageRegion<3> region{ size }; auto scalar_image = ScalarImageType::New(); auto vector_image = VectorImageType::New(); diff --git a/Modules/Core/Common/test/itkConstNeighborhoodIteratorTest.cxx b/Modules/Core/Common/test/itkConstNeighborhoodIteratorTest.cxx index 7df8a35c369..5523992c75c 100644 --- a/Modules/Core/Common/test/itkConstNeighborhoodIteratorTest.cxx +++ b/Modules/Core/Common/test/itkConstNeighborhoodIteratorTest.cxx @@ -35,9 +35,7 @@ GetTestImage(int d1, int d2, int d3, int d4) sizeND[2] = d3; sizeND[3] = d4; - constexpr itk::Index<4> origND{}; - - const itk::ImageRegion<4> RegionND{ origND, sizeND }; + const itk::ImageRegion<4> RegionND{ sizeND }; auto imageND = TestImageType::New(); imageND->SetRegions(RegionND); diff --git a/Modules/Core/Common/test/itkConstNeighborhoodIteratorWithOnlyIndexTest.cxx b/Modules/Core/Common/test/itkConstNeighborhoodIteratorWithOnlyIndexTest.cxx index a04a81a64fa..f9129aea53d 100644 --- a/Modules/Core/Common/test/itkConstNeighborhoodIteratorWithOnlyIndexTest.cxx +++ b/Modules/Core/Common/test/itkConstNeighborhoodIteratorWithOnlyIndexTest.cxx @@ -29,9 +29,7 @@ itkConstNeighborhoodIteratorWithOnlyIndexTestGetTestImage(int d1, int d2, int d3 sizeND[2] = d3; sizeND[3] = d4; - constexpr itk::Index<4> origND{}; - - const itk::ImageRegion<4> RegionND{ origND, sizeND }; + const itk::ImageRegion<4> RegionND{ sizeND }; auto imageND = TImage::New(); imageND->SetRegions(RegionND); diff --git a/Modules/Core/Common/test/itkMinimumMaximumImageCalculatorTest.cxx b/Modules/Core/Common/test/itkMinimumMaximumImageCalculatorTest.cxx index d9320511e32..4e42a711922 100644 --- a/Modules/Core/Common/test/itkMinimumMaximumImageCalculatorTest.cxx +++ b/Modules/Core/Common/test/itkMinimumMaximumImageCalculatorTest.cxx @@ -98,8 +98,7 @@ itkMinimumMaximumImageCalculatorTest(int, char *[]) // Set the region over which perform the computations constexpr itk::Size<3> regionSize{ { 4, 4, 4 } }; - constexpr itk::Index<3> idx{ { 0, 0, 0 } }; - const MinMaxCalculatorType::RegionType computationRegion{ idx, regionSize }; + const MinMaxCalculatorType::RegionType computationRegion{ regionSize }; calculator->SetRegion(computationRegion); diff --git a/Modules/Core/Common/test/itkSliceIteratorTest.cxx b/Modules/Core/Common/test/itkSliceIteratorTest.cxx index ddba0da64fc..a07b7bbe142 100644 --- a/Modules/Core/Common/test/itkSliceIteratorTest.cxx +++ b/Modules/Core/Common/test/itkSliceIteratorTest.cxx @@ -147,10 +147,9 @@ itkSliceIteratorTest(int, char *[]) try { - constexpr itk::Size<2> hoodRadius{ 2, 2 }; - constexpr itk::Size<2> imgSize{ 20, 20 }; - constexpr itk::Index<2> zeroIndex{}; - itk::ImageRegion<2> reg = { zeroIndex, imgSize }; + constexpr itk::Size<2> hoodRadius{ 2, 2 }; + constexpr itk::Size<2> imgSize{ 20, 20 }; + itk::ImageRegion<2> reg{ imgSize }; const std::slice hslice(10, 5, 1); // slice through the horizontal center const std::slice vslice(2, 5, 5); // slice through the vertical center diff --git a/Modules/Filtering/ImageFilterBase/test/itkCastImageFilterTest.cxx b/Modules/Filtering/ImageFilterBase/test/itkCastImageFilterTest.cxx index 53e4cf6284b..bdebb679173 100644 --- a/Modules/Filtering/ImageFilterBase/test/itkCastImageFilterTest.cxx +++ b/Modules/Filtering/ImageFilterBase/test/itkCastImageFilterTest.cxx @@ -283,10 +283,8 @@ TestVectorImageCast1() // Create a 1x3 image of 2D vectors auto image = FloatVectorImageType::New(); - constexpr itk::Size<2> size{ { 1, 3 } }; - constexpr itk::Index<2> start{ { 0, 0 } }; - - const itk::ImageRegion<2> region(start, size); + constexpr itk::Size<2> size{ { 1, 3 } }; + const itk::ImageRegion<2> region{ size }; image->SetNumberOfComponentsPerPixel(2); image->SetRegions(region); image->Allocate(); @@ -350,10 +348,8 @@ TestVectorImageCast2() // Create a 1x3 image of 2D vectors auto image = FloatVectorImageType::New(); - constexpr itk::Size<2> size{ { 1, 3 } }; - constexpr itk::Index<2> start{ { 0, 0 } }; - - const itk::ImageRegion<2> region(start, size); + constexpr itk::Size<2> size{ { 1, 3 } }; + const itk::ImageRegion<2> region{ size }; image->SetNumberOfComponentsPerPixel(2); image->SetRegions(region); image->Allocate(); diff --git a/Modules/IO/SpatialObjects/test/itkReadWriteSpatialObjectTest.cxx b/Modules/IO/SpatialObjects/test/itkReadWriteSpatialObjectTest.cxx index c1138491e2f..0403aee48b9 100644 --- a/Modules/IO/SpatialObjects/test/itkReadWriteSpatialObjectTest.cxx +++ b/Modules/IO/SpatialObjects/test/itkReadWriteSpatialObjectTest.cxx @@ -279,10 +279,7 @@ itkReadWriteSpatialObjectTest(int argc, char * argv[]) spacing[i] = i + 1; } - RegionType region; - region.SetSize(size); - constexpr itk::Index<3> zeroIndex{}; - region.SetIndex(zeroIndex); + RegionType region{ size }; itkImage->SetRegions(region); itkImage->SetSpacing(spacing); itkImage->Allocate(); From 80f8bfb95a9b4d18d1e1395e407cd4516750010f Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Sun, 16 Nov 2025 16:44:44 +0100 Subject: [PATCH 3/3] STYLE: Remove `IndexType index{0}` from region initialization in tests Removed `IndexType` variables initialized by zero's (`{ 0, ..., 0 }`), that were only there as the index argument of a region initialization. Using Notepad++, Replace in Files (Search Mode: Regular expression), doing: Find what: `^( [ ]+)constexpr IndexType[ ]+(\w+){[0, ]*};[\r\n]+\1(.*[rR]egion.* \w+)\(\2, (.*)\);$` Find what: `^( [ ]+)constexpr IndexType[ ]+(\w+){[0, ]*};[\r\n]+\1(.*[rR]egion.* \w+){ \2, (.*) }];$` Find what: `^( [ ]+)constexpr IndexType[ ]+(\w+){[0, ]*};[\r\n]+\1(.*[rR]egion.* \w+) = { \2, (.*) };$` Replace with: $1$3{ $4 }; Manually fixed itkCenteredVersorTransformInitializerTest.cxx compile errors after removing `index`. Removed `IndexType` that have become unused with this commit. Follow-up to pull request https://github.com/InsightSoftwareConsortium/ITK/pull/5627 commit f9885d27a08b7a94448591777908404821de6623 "STYLE: Remove `T::IndexType index{}` from region initialization in tests" --- .../test/itkConstantBoundaryConditionTest.cxx | 7 +++--- .../test/itkPeriodicBoundaryConditionTest.cxx | 5 ++-- .../test/itkZeroFluxBoundaryConditionTest.cxx | 5 ++-- .../test/itkDivideImageFilterTest2.cxx | 9 ++----- ...peningByReconstructionImageFilterTest2.cxx | 6 ++--- ...ianRandomSpatialNeighborSubsamplerTest.cxx | 7 +++--- .../test/itkSpatialNeighborSubsamplerTest.cxx | 7 +++--- ...ormRandomSpatialNeighborSubsamplerTest.cxx | 3 +-- ...CenteredVersorTransformInitializerTest.cxx | 24 +++++++++---------- .../test/itkDemonsRegistrationFilterTest.cxx | 5 +--- ...feomorphicDemonsRegistrationFilterTest.cxx | 5 +--- ...tricForcesDemonsRegistrationFilterTest.cxx | 5 +--- ...tkLevelSetMotionRegistrationFilterTest.cxx | 5 +--- ...tricForcesDemonsRegistrationFilterTest.cxx | 5 +--- 14 files changed, 34 insertions(+), 64 deletions(-) diff --git a/Modules/Core/Common/test/itkConstantBoundaryConditionTest.cxx b/Modules/Core/Common/test/itkConstantBoundaryConditionTest.cxx index fb0b1ab55a8..742899e50a5 100644 --- a/Modules/Core/Common/test/itkConstantBoundaryConditionTest.cxx +++ b/Modules/Core/Common/test/itkConstantBoundaryConditionTest.cxx @@ -121,10 +121,9 @@ int itkConstantBoundaryConditionTest(int, char *[]) { // Test an image to cover one operator() method. - auto image = ImageType::New(); - constexpr SizeType imageSize{ 5, 5 }; - constexpr IndexType imageIndex{ 0, 0 }; - RegionType imageRegion{ imageIndex, imageSize }; + auto image = ImageType::New(); + constexpr SizeType imageSize{ 5, 5 }; + RegionType imageRegion{ imageSize }; image->SetRegions(imageRegion); image->Allocate(); diff --git a/Modules/Core/Common/test/itkPeriodicBoundaryConditionTest.cxx b/Modules/Core/Common/test/itkPeriodicBoundaryConditionTest.cxx index ae2b3e9d506..50d85f30c4e 100644 --- a/Modules/Core/Common/test/itkPeriodicBoundaryConditionTest.cxx +++ b/Modules/Core/Common/test/itkPeriodicBoundaryConditionTest.cxx @@ -124,9 +124,8 @@ itkPeriodicBoundaryConditionTest(int, char *[]) // Test an image to cover one operator() method. auto image = ImageType::New(); - constexpr SizeType imageSize{ 5, 5 }; - constexpr IndexType imageIndex{ 0, 0 }; - const RegionType imageRegion(imageIndex, imageSize); + constexpr SizeType imageSize{ 5, 5 }; + const RegionType imageRegion{ imageSize }; image->SetRegions(imageRegion); image->Allocate(); diff --git a/Modules/Core/Common/test/itkZeroFluxBoundaryConditionTest.cxx b/Modules/Core/Common/test/itkZeroFluxBoundaryConditionTest.cxx index d8db671c640..113e649408f 100644 --- a/Modules/Core/Common/test/itkZeroFluxBoundaryConditionTest.cxx +++ b/Modules/Core/Common/test/itkZeroFluxBoundaryConditionTest.cxx @@ -124,9 +124,8 @@ itkZeroFluxBoundaryConditionTest(int, char *[]) // Test an image to cover one operator() method. auto image = ImageType::New(); - constexpr SizeType imageSize{ 5, 5 }; - constexpr IndexType imageIndex{ 0, 0 }; - const RegionType imageRegion{ imageIndex, imageSize }; + constexpr SizeType imageSize{ 5, 5 }; + const RegionType imageRegion{ imageSize }; image->SetRegions(imageRegion); image->Allocate(); diff --git a/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest2.cxx b/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest2.cxx index cab6d677e81..801e156ee1f 100644 --- a/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest2.cxx +++ b/Modules/Filtering/ImageIntensity/test/itkDivideImageFilterTest2.cxx @@ -40,10 +40,6 @@ itkDivideImageFilterTest2(int, char *[]) // Declare appropriate Iterator types for each image using OutputImageIteratorType = itk::ImageRegionIteratorWithIndex; - - // Declare the type of the index to access images - using IndexType = itk::Index; - // Declare the type of the size using SizeType = itk::Size; @@ -55,9 +51,8 @@ itkDivideImageFilterTest2(int, char *[]) auto inputImageB = InputImageType2::New(); // Define their size, and start index - constexpr SizeType size{ 2, 2, 2 }; - constexpr IndexType start{ 0, 0, 0 }; - RegionType region{ start, size }; + constexpr SizeType size{ 2, 2, 2 }; + RegionType region{ size }; // Initialize Image A inputImageA->SetRegions(region); diff --git a/Modules/Filtering/MathematicalMorphology/test/itkOpeningByReconstructionImageFilterTest2.cxx b/Modules/Filtering/MathematicalMorphology/test/itkOpeningByReconstructionImageFilterTest2.cxx index 11d3cff48bf..5c7284688ac 100644 --- a/Modules/Filtering/MathematicalMorphology/test/itkOpeningByReconstructionImageFilterTest2.cxx +++ b/Modules/Filtering/MathematicalMorphology/test/itkOpeningByReconstructionImageFilterTest2.cxx @@ -41,7 +41,6 @@ itkOpeningByReconstructionImageFilterTest2(int argc, char * argv[]) using OutputImageType = itk::Image; using RegionType = InputImageType::RegionType; using SizeType = InputImageType::SizeType; - using IndexType = InputImageType::IndexType; using SpacingType = InputImageType::SpacingType; using OriginType = InputImageType::PointType; @@ -56,9 +55,8 @@ itkOpeningByReconstructionImageFilterTest2(int argc, char * argv[]) auto inputImage = InputImageType::New(); // Define regions of input image - auto size = SizeType::Filled(std::stoi(argv[2])); - constexpr IndexType index{}; - RegionType region = { index, size }; + auto size = SizeType::Filled(std::stoi(argv[2])); + RegionType region{ size }; // fill spacing and origin OriginType origin; diff --git a/Modules/Numerics/Statistics/test/itkGaussianRandomSpatialNeighborSubsamplerTest.cxx b/Modules/Numerics/Statistics/test/itkGaussianRandomSpatialNeighborSubsamplerTest.cxx index 4dde1299106..1e4011a51fe 100644 --- a/Modules/Numerics/Statistics/test/itkGaussianRandomSpatialNeighborSubsamplerTest.cxx +++ b/Modules/Numerics/Statistics/test/itkGaussianRandomSpatialNeighborSubsamplerTest.cxx @@ -48,10 +48,9 @@ itkGaussianRandomSpatialNeighborSubsamplerTest(int argc, char * argv[]) using SamplerType = itk::Statistics::GaussianRandomSpatialNeighborSubsampler; using WriterType = itk::ImageFileWriter; - auto inImage = FloatImage::New(); - auto sz = SizeType::Filled(35); - constexpr IndexType idx{}; - const RegionType region{ idx, sz }; + auto inImage = FloatImage::New(); + auto sz = SizeType::Filled(35); + const RegionType region{ sz }; inImage->SetRegions(region); inImage->AllocateInitialized(); diff --git a/Modules/Numerics/Statistics/test/itkSpatialNeighborSubsamplerTest.cxx b/Modules/Numerics/Statistics/test/itkSpatialNeighborSubsamplerTest.cxx index 167b7da4f98..d0cd5eb708d 100644 --- a/Modules/Numerics/Statistics/test/itkSpatialNeighborSubsamplerTest.cxx +++ b/Modules/Numerics/Statistics/test/itkSpatialNeighborSubsamplerTest.cxx @@ -77,10 +77,9 @@ itkSpatialNeighborSubsamplerTest(int, char *[]) using SamplerType = itk::Statistics::SpatialNeighborSubsampler; using IteratorType = itk::ImageRegionConstIteratorWithIndex; - auto inImage = ImageType::New(); - constexpr auto sz = SizeType::Filled(25); - constexpr IndexType idx{}; - const RegionType region{ idx, sz }; + auto inImage = ImageType::New(); + constexpr auto sz = SizeType::Filled(25); + const RegionType region{ sz }; inImage->SetRegions(region); inImage->AllocateInitialized(); diff --git a/Modules/Numerics/Statistics/test/itkUniformRandomSpatialNeighborSubsamplerTest.cxx b/Modules/Numerics/Statistics/test/itkUniformRandomSpatialNeighborSubsamplerTest.cxx index ed0ee1a7608..6e7c83d47e3 100644 --- a/Modules/Numerics/Statistics/test/itkUniformRandomSpatialNeighborSubsamplerTest.cxx +++ b/Modules/Numerics/Statistics/test/itkUniformRandomSpatialNeighborSubsamplerTest.cxx @@ -52,8 +52,7 @@ itkUniformRandomSpatialNeighborSubsamplerTest(int argc, char * argv[]) auto inImage = FloatImage::New(); constexpr typename SizeType::value_type regionSizeVal = 35; constexpr auto sz = SizeType::Filled(regionSizeVal); - constexpr IndexType idx{}; - const RegionType region{ idx, sz }; + const RegionType region{ sz }; inImage->SetRegions(region); inImage->AllocateInitialized(); diff --git a/Modules/Registration/Common/test/itkCenteredVersorTransformInitializerTest.cxx b/Modules/Registration/Common/test/itkCenteredVersorTransformInitializerTest.cxx index eba479416d2..1f3be198fc7 100644 --- a/Modules/Registration/Common/test/itkCenteredVersorTransformInitializerTest.cxx +++ b/Modules/Registration/Common/test/itkCenteredVersorTransformInitializerTest.cxx @@ -53,13 +53,11 @@ itkCenteredVersorTransformInitializerTest(int, char *[]) // Transform Type using TransformType = itk::VersorRigid3DTransform; - SizeType size{ { 100, 100, 150 } }; - PointType fixedOrigin{}; - PointType movingOrigin{ { 29.0, 17.0, 13.0 } }; - SpacingType spacing{ { 1.5, 1.5, 1.0 } }; - constexpr IndexType index{}; - - const RegionType region{ index, size }; + SizeType size{ { 100, 100, 150 } }; + PointType fixedOrigin{}; + PointType movingOrigin{ { 29.0, 17.0, 13.0 } }; + SpacingType spacing{ { 1.5, 1.5, 1.0 } }; + const RegionType region{ size }; auto fixedImage = FixedImageType::New(); @@ -79,9 +77,9 @@ itkCenteredVersorTransformInitializerTest(int, char *[]) SizeType internalSize; IndexType internalIndex; - internalIndex[0] = index[0] + 20; - internalIndex[1] = index[1] + 30; - internalIndex[2] = index[2] + 10; + internalIndex[0] = 20; + internalIndex[1] = 30; + internalIndex[2] = 10; internalSize[0] = size[0] - 2 * 20; internalSize[1] = size[1] - 2 * 30; @@ -101,9 +99,9 @@ itkCenteredVersorTransformInitializerTest(int, char *[]) } - internalIndex[0] = index[0] + 10; - internalIndex[1] = index[1] + 20; - internalIndex[2] = index[2] + 30; + internalIndex[0] = 10; + internalIndex[1] = 20; + internalIndex[2] = 30; internalSize[0] = size[0] - 2 * 10; internalSize[1] = size[1] - 2 * 20; diff --git a/Modules/Registration/PDEDeformable/test/itkDemonsRegistrationFilterTest.cxx b/Modules/Registration/PDEDeformable/test/itkDemonsRegistrationFilterTest.cxx index 54d106ff41e..a90663a7baf 100644 --- a/Modules/Registration/PDEDeformable/test/itkDemonsRegistrationFilterTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkDemonsRegistrationFilterTest.cxx @@ -116,7 +116,6 @@ itkDemonsRegistrationFilterTest(int, char *[]) using ImageType = itk::Image; using VectorType = itk::Vector; using FieldType = itk::Image; - using IndexType = ImageType::IndexType; using SizeType = ImageType::SizeType; using RegionType = ImageType::RegionType; @@ -126,9 +125,7 @@ itkDemonsRegistrationFilterTest(int, char *[]) SizeType size; size.SetSize(sizeArray); - constexpr IndexType index{}; - - const RegionType region{ index, size }; + const RegionType region{ size }; auto moving = ImageType::New(); auto fixed = ImageType::New(); diff --git a/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest.cxx b/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest.cxx index 80e1a62855a..8cbbffc53c7 100644 --- a/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkDiffeomorphicDemonsRegistrationFilterTest.cxx @@ -125,7 +125,6 @@ itkDiffeomorphicDemonsRegistrationFilterTest(int argc, char * argv[]) using ImageType = itk::Image; using VectorType = itk::Vector; using FieldType = itk::Image; - using IndexType = ImageType::IndexType; using SizeType = ImageType::SizeType; using RegionType = ImageType::RegionType; using DirectionType = ImageType::DirectionType; @@ -138,9 +137,7 @@ itkDiffeomorphicDemonsRegistrationFilterTest(int argc, char * argv[]) SizeType size; size.SetSize(sizeArray); - constexpr IndexType index{}; - - const RegionType region{ index, size }; + const RegionType region{ size }; DirectionType direction; direction.SetIdentity(); diff --git a/Modules/Registration/PDEDeformable/test/itkFastSymmetricForcesDemonsRegistrationFilterTest.cxx b/Modules/Registration/PDEDeformable/test/itkFastSymmetricForcesDemonsRegistrationFilterTest.cxx index cda6a0d6953..c63b9136734 100644 --- a/Modules/Registration/PDEDeformable/test/itkFastSymmetricForcesDemonsRegistrationFilterTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkFastSymmetricForcesDemonsRegistrationFilterTest.cxx @@ -115,7 +115,6 @@ itkFastSymmetricForcesDemonsRegistrationFilterTest(int, char *[]) using ImageType = itk::Image; using VectorType = itk::Vector; using FieldType = itk::Image; - using IndexType = ImageType::IndexType; using SizeType = ImageType::SizeType; using RegionType = ImageType::RegionType; @@ -125,9 +124,7 @@ itkFastSymmetricForcesDemonsRegistrationFilterTest(int, char *[]) SizeType size; size.SetSize(sizeArray); - constexpr IndexType index{}; - - const RegionType region{ index, size }; + const RegionType region{ size }; auto moving = ImageType::New(); auto fixed = ImageType::New(); diff --git a/Modules/Registration/PDEDeformable/test/itkLevelSetMotionRegistrationFilterTest.cxx b/Modules/Registration/PDEDeformable/test/itkLevelSetMotionRegistrationFilterTest.cxx index e4792d1b956..af1d628a605 100644 --- a/Modules/Registration/PDEDeformable/test/itkLevelSetMotionRegistrationFilterTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkLevelSetMotionRegistrationFilterTest.cxx @@ -130,7 +130,6 @@ itkLevelSetMotionRegistrationFilterTest(int argc, char * argv[]) using ImageType = itk::Image; using VectorType = itk::Vector; using FieldType = itk::Image; - using IndexType = ImageType::IndexType; using SizeType = ImageType::SizeType; using RegionType = ImageType::RegionType; @@ -141,9 +140,7 @@ itkLevelSetMotionRegistrationFilterTest(int argc, char * argv[]) SizeType size; size.SetSize(sizeArray); - constexpr IndexType index{}; - - const RegionType region{ index, size }; + const RegionType region{ size }; auto moving = ImageType::New(); auto fixed = ImageType::New(); diff --git a/Modules/Registration/PDEDeformable/test/itkSymmetricForcesDemonsRegistrationFilterTest.cxx b/Modules/Registration/PDEDeformable/test/itkSymmetricForcesDemonsRegistrationFilterTest.cxx index 96223482db1..0fe6dbf2510 100644 --- a/Modules/Registration/PDEDeformable/test/itkSymmetricForcesDemonsRegistrationFilterTest.cxx +++ b/Modules/Registration/PDEDeformable/test/itkSymmetricForcesDemonsRegistrationFilterTest.cxx @@ -105,7 +105,6 @@ itkSymmetricForcesDemonsRegistrationFilterTest(int, char *[]) using VectorType = itk::Vector; using FieldType = itk::Image; using FloatImageType = itk::Image; - using IndexType = ImageType::IndexType; using SizeType = ImageType::SizeType; using RegionType = ImageType::RegionType; @@ -116,9 +115,7 @@ itkSymmetricForcesDemonsRegistrationFilterTest(int, char *[]) SizeType size; size.SetSize(sizeArray); - constexpr IndexType index{}; - - const RegionType region{ index, size }; + const RegionType region{ size }; auto moving = ImageType::New(); auto fixed = ImageType::New();