From 6027f17f2c13bf12e926ff8f8365b968ae151b05 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Mon, 6 Mar 2023 14:53:46 -0600 Subject: [PATCH] STYLE: Prefer C++11 zero initializer to ZeroValue Prefer to use standard C++ language initializers to the itk::NumericValues<>::ZeroValue() initializers. --- Examples/Iterators/ImageLinearIteratorWithIndex2.cxx | 2 +- Examples/RegistrationITKv4/ThinPlateSplineWarp.cxx | 2 +- Modules/Core/Common/test/itkIntTypesTest.cxx | 2 +- .../Core/Common/test/itkSymmetricSecondRankTensorTest.cxx | 2 +- .../include/itkGPUFiniteDifferenceFunction.h | 2 +- .../SpatialObjects/test/itkImageMaskSpatialObjectTest2.cxx | 2 +- .../DiffusionTensorImage/test/itkDiffusionTensor3DTest.cxx | 6 +++--- .../itkGaussianExponentialDiffeomorphicTransformTest.cxx | 2 +- ...ssianSmoothingOnUpdateDisplacementFieldTransformTest.cxx | 2 +- .../test/itkContourDirectedMeanDistanceImageFilterTest.cxx | 2 +- .../test/itkContourMeanDistanceImageFilterTest.cxx | 2 +- .../test/itkDirectedHausdorffDistanceImageFilterTest1.cxx | 2 +- .../test/itkHausdorffDistanceImageFilterTest.cxx | 2 +- .../Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx | 2 +- .../test/itkFastMarchingImageTopologicalTest.cxx | 2 +- .../test/itkFastMarchingUpwindGradientBaseTest.cxx | 2 +- .../test/itkSimpleContourExtractorImageFilterTest.cxx | 2 +- .../test/itkMaskNeighborhoodOperatorImageFilterTest.cxx | 2 +- .../Filtering/Path/include/itkPolyLineParametricPath.hxx | 2 +- .../test/itkExtractOrthogonalSwath2DImageFilterTest.cxx | 2 +- .../test/itkCleanQuadEdgeMeshFilterTest.cxx | 2 +- .../IO/ImageBase/test/itkLargeImageWriteConvertReadTest.cxx | 2 +- Modules/IO/ImageBase/test/itkLargeImageWriteReadTest.cxx | 5 ++--- Modules/IO/MINC/test/itkMINCImageIOTest.cxx | 4 ++-- Modules/IO/MeshBYU/include/itkBYUMeshIO.h | 4 ++-- Modules/IO/MeshBYU/src/itkBYUMeshIO.cxx | 2 +- Modules/IO/MeshBase/include/itkMeshIOBase.h | 4 ++-- Modules/IO/MeshOBJ/include/itkOBJMeshIO.h | 6 +++--- Modules/IO/RAW/test/itkRawImageIOTest3.cxx | 2 +- Modules/IO/RAW/test/itkRawImageIOTest4.cxx | 4 ++-- Modules/IO/RAW/test/itkRawImageIOTest5.cxx | 2 +- Modules/IO/TIFF/test/itkLargeTIFFImageWriteReadTest.cxx | 6 ++---- .../itkDiscreteGradientMagnitudeGaussianImageFunction.hxx | 2 +- .../Review/test/itkGridForwardWarpImageFilterTest.cxx | 2 +- .../itkMultiphaseSparseFiniteDifferenceImageFilterTest.cxx | 2 +- .../include/itkConjugateGradientLineSearchOptimizerv4.hxx | 2 +- .../itkStandardDeviationPerComponentSampleFilter.hxx | 2 +- .../test/itkMeanSquaresImageToImageMetricv4SpeedTest.cxx | 2 +- .../Metricsv4/test/itkObjectToObjectMultiMetricv4Test.cxx | 4 ++-- .../include/itkVectorConnectedComponentImageFilter.h | 4 ++-- .../test/itkConnectedComponentImageFilterTest.cxx | 2 +- .../include/itkConfidenceConnectedImageFilter.hxx | 6 +++--- .../Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx | 2 +- 43 files changed, 57 insertions(+), 60 deletions(-) diff --git a/Examples/Iterators/ImageLinearIteratorWithIndex2.cxx b/Examples/Iterators/ImageLinearIteratorWithIndex2.cxx index 2b9b1a03811..b31c2d44e05 100644 --- a/Examples/Iterators/ImageLinearIteratorWithIndex2.cxx +++ b/Examples/Iterators/ImageLinearIteratorWithIndex2.cxx @@ -160,7 +160,7 @@ main(int argc, char * argv[]) it.GoToBegin(); while (!it.IsAtEnd()) { - SumType sum = itk::NumericTraits::ZeroValue(); + SumType sum{}; it.GoToBeginOfLine(); index4D = it.GetIndex(); while (!it.IsAtEndOfLine()) diff --git a/Examples/RegistrationITKv4/ThinPlateSplineWarp.cxx b/Examples/RegistrationITKv4/ThinPlateSplineWarp.cxx index 61d9305c852..20f555e9a8c 100644 --- a/Examples/RegistrationITKv4/ThinPlateSplineWarp.cxx +++ b/Examples/RegistrationITKv4/ThinPlateSplineWarp.cxx @@ -110,7 +110,7 @@ main(int argc, char * argv[]) targetLandMarks->GetPoints(); // Software Guide : EndCodeSnippet - PointIdType id = itk::NumericTraits::ZeroValue(); + PointIdType id{}; // Read in the list of landmarks std::ifstream infile; diff --git a/Modules/Core/Common/test/itkIntTypesTest.cxx b/Modules/Core/Common/test/itkIntTypesTest.cxx index 975f62d1b52..19c40d542a9 100644 --- a/Modules/Core/Common/test/itkIntTypesTest.cxx +++ b/Modules/Core/Common/test/itkIntTypesTest.cxx @@ -44,7 +44,7 @@ bool CheckTraits(bool issigned, T * = nullptr) { // make sure that we have a specialized NumericTraits - T t0 = itk::NumericTraits::ZeroValue(); + T t0{}; T t1 = itk::NumericTraits::OneValue(); // just here so that we use the variable diff --git a/Modules/Core/Common/test/itkSymmetricSecondRankTensorTest.cxx b/Modules/Core/Common/test/itkSymmetricSecondRankTensorTest.cxx index 514a037b361..86561145cb5 100644 --- a/Modules/Core/Common/test/itkSymmetricSecondRankTensorTest.cxx +++ b/Modules/Core/Common/test/itkSymmetricSecondRankTensorTest.cxx @@ -388,7 +388,7 @@ itkSymmetricSecondRankTensorTest(int, char *[]) tensor3D(2, 1) = 0.0; // overrides (1,2) tensor3D(2, 2) = 29.0; - AccumulateValueType expectedTrace = itk::NumericTraits::ZeroValue(); + AccumulateValueType expectedTrace{}; expectedTrace += tensor3D(0, 0); expectedTrace += tensor3D(1, 1); diff --git a/Modules/Core/GPUFiniteDifference/include/itkGPUFiniteDifferenceFunction.h b/Modules/Core/GPUFiniteDifference/include/itkGPUFiniteDifferenceFunction.h index efe813fbe9f..cc46614e2b2 100644 --- a/Modules/Core/GPUFiniteDifference/include/itkGPUFiniteDifferenceFunction.h +++ b/Modules/Core/GPUFiniteDifference/include/itkGPUFiniteDifferenceFunction.h @@ -91,7 +91,7 @@ class ITK_TEMPLATE_EXPORT GPUFiniteDifferenceFunction : public FiniteDifferenceF void * itkNotUsed(globalData), const FloatOffsetType & itkNotUsed(offset = FloatOffsetType(0.0))) override { - PixelType pix = itk::NumericTraits::ZeroValue(); + PixelType pix{}; return pix; } #endif diff --git a/Modules/Core/SpatialObjects/test/itkImageMaskSpatialObjectTest2.cxx b/Modules/Core/SpatialObjects/test/itkImageMaskSpatialObjectTest2.cxx index 2510dd70bc9..a38dd32d1eb 100644 --- a/Modules/Core/SpatialObjects/test/itkImageMaskSpatialObjectTest2.cxx +++ b/Modules/Core/SpatialObjects/test/itkImageMaskSpatialObjectTest2.cxx @@ -199,7 +199,7 @@ itkImageMaskSpatialObjectTest2(int, char *[]) { point += incrementVector; const bool isInside = maskSO->IsInsideInWorldSpace(point); - double value = itk::NumericTraits::ZeroValue(); + double value{}; maskSO->ValueAtInWorldSpace(point, value); const bool isZero = (itk::Math::ExactlyEquals(value, itk::NumericTraits::ZeroValue())); if ((isInside && isZero) || (!isInside && !isZero)) diff --git a/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DTest.cxx b/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DTest.cxx index e54d17d8f8f..bf6491f89f3 100644 --- a/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DTest.cxx +++ b/Modules/Filtering/DiffusionTensorImage/test/itkDiffusionTensor3DTest.cxx @@ -360,7 +360,7 @@ itkDiffusionTensor3DTest(int, char *[]) tensor3(2, 1) = 0.0; // overrides (1,2) tensor3(2, 2) = 29.0; - AccumulateValueType expectedTrace = itk::NumericTraits::ZeroValue(); + AccumulateValueType expectedTrace{}; expectedTrace += tensor3(0, 0); expectedTrace += tensor3(1, 1); @@ -430,13 +430,13 @@ itkDiffusionTensor3DTest(int, char *[]) TensorType nonpositiveMinTensor = itk::NumericTraits::NonpositiveMin(); std::cout << nonpositiveMinTensor << std::endl; - TensorType zeroValue = itk::NumericTraits::ZeroValue(); + TensorType zeroValue{}; std::cout << zeroValue << std::endl; TensorType oneValue = itk::NumericTraits::OneValue(); std::cout << oneValue << std::endl; - TensorType zero = itk::NumericTraits::ZeroValue(); + TensorType zero{}; std::cout << zero << std::endl; TensorType one = itk::NumericTraits::OneValue(); diff --git a/Modules/Filtering/DisplacementField/test/itkGaussianExponentialDiffeomorphicTransformTest.cxx b/Modules/Filtering/DisplacementField/test/itkGaussianExponentialDiffeomorphicTransformTest.cxx index 336f4510980..dd4a3be76a5 100644 --- a/Modules/Filtering/DisplacementField/test/itkGaussianExponentialDiffeomorphicTransformTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkGaussianExponentialDiffeomorphicTransformTest.cxx @@ -68,7 +68,7 @@ itkGaussianExponentialDiffeomorphicTransformTest(int, char *[]) std::cout << "Test SmoothDisplacementFieldGauss" << std::endl; DisplacementTransformType::ParametersType params; using ParametersValueType = DisplacementTransformType::ParametersValueType; - ParametersValueType paramsZero = itk::NumericTraits::ValueType>::ZeroValue(); + ParametersValueType paramsZero{}; DisplacementTransformType::ParametersType paramsFill(displacementTransform->GetNumberOfParameters()); DisplacementTransformType::ParametersValueType paramsFillValue = 0.0; paramsFill.Fill(paramsFillValue); diff --git a/Modules/Filtering/DisplacementField/test/itkGaussianSmoothingOnUpdateDisplacementFieldTransformTest.cxx b/Modules/Filtering/DisplacementField/test/itkGaussianSmoothingOnUpdateDisplacementFieldTransformTest.cxx index 17828f8dcfa..42a965ede44 100644 --- a/Modules/Filtering/DisplacementField/test/itkGaussianSmoothingOnUpdateDisplacementFieldTransformTest.cxx +++ b/Modules/Filtering/DisplacementField/test/itkGaussianSmoothingOnUpdateDisplacementFieldTransformTest.cxx @@ -61,7 +61,7 @@ itkGaussianSmoothingOnUpdateDisplacementFieldTransformTest(int, char *[]) /* Test SmoothDisplacementFieldGauss */ std::cout << "Test SmoothDisplacementFieldGauss" << std::endl; using ParametersValueType = DisplacementTransformType::ParametersValueType; - ParametersValueType paramsZero = itk::NumericTraits::ValueType>::ZeroValue(); + ParametersValueType paramsZero{}; DisplacementTransformType::ParametersType params; DisplacementTransformType::ParametersType paramsFill(displacementTransform->GetNumberOfParameters()); DisplacementTransformType::ParametersValueType paramsFillValue = 0.0; diff --git a/Modules/Filtering/DistanceMap/test/itkContourDirectedMeanDistanceImageFilterTest.cxx b/Modules/Filtering/DistanceMap/test/itkContourDirectedMeanDistanceImageFilterTest.cxx index 0a609cf5dc5..48d24b118b2 100644 --- a/Modules/Filtering/DistanceMap/test/itkContourDirectedMeanDistanceImageFilterTest.cxx +++ b/Modules/Filtering/DistanceMap/test/itkContourDirectedMeanDistanceImageFilterTest.cxx @@ -65,7 +65,7 @@ itkContourDirectedMeanDistanceImageFilterTest(int, char *[]) region2.SetIndex(index); itk::ImageRegionIterator it1(image1, region1); - Pixel1Type count = itk::NumericTraits::ZeroValue(); + Pixel1Type count{}; while (!it1.IsAtEnd()) { it1.Set(++count); diff --git a/Modules/Filtering/DistanceMap/test/itkContourMeanDistanceImageFilterTest.cxx b/Modules/Filtering/DistanceMap/test/itkContourMeanDistanceImageFilterTest.cxx index 9bd44f4a703..255570c2404 100644 --- a/Modules/Filtering/DistanceMap/test/itkContourMeanDistanceImageFilterTest.cxx +++ b/Modules/Filtering/DistanceMap/test/itkContourMeanDistanceImageFilterTest.cxx @@ -73,7 +73,7 @@ itkContourMeanDistanceImageFilterTest(int argc, char * argv[]) region2.SetIndex(index); itk::ImageRegionIterator it1(image1, region1); - Pixel1Type count = itk::NumericTraits::ZeroValue(); + Pixel1Type count{}; while (!it1.IsAtEnd()) { it1.Set(++count); diff --git a/Modules/Filtering/DistanceMap/test/itkDirectedHausdorffDistanceImageFilterTest1.cxx b/Modules/Filtering/DistanceMap/test/itkDirectedHausdorffDistanceImageFilterTest1.cxx index 05fe1894c79..38058484de9 100644 --- a/Modules/Filtering/DistanceMap/test/itkDirectedHausdorffDistanceImageFilterTest1.cxx +++ b/Modules/Filtering/DistanceMap/test/itkDirectedHausdorffDistanceImageFilterTest1.cxx @@ -65,7 +65,7 @@ itkDirectedHausdorffDistanceImageFilterTest1(int, char *[]) region2.SetIndex(index); itk::ImageRegionIterator it1(image1, region1); - Pixel1Type count = itk::NumericTraits::ZeroValue(); + Pixel1Type count{}; while (!it1.IsAtEnd()) { it1.Set(++count); diff --git a/Modules/Filtering/DistanceMap/test/itkHausdorffDistanceImageFilterTest.cxx b/Modules/Filtering/DistanceMap/test/itkHausdorffDistanceImageFilterTest.cxx index 13b2293f12c..24942a10068 100644 --- a/Modules/Filtering/DistanceMap/test/itkHausdorffDistanceImageFilterTest.cxx +++ b/Modules/Filtering/DistanceMap/test/itkHausdorffDistanceImageFilterTest.cxx @@ -71,7 +71,7 @@ itkHausdorffDistanceImageFilterTest(int argc, char * argv[]) region2.SetIndex(index); itk::ImageRegionIterator it1(image1, region1); - Pixel1Type count = itk::NumericTraits::ZeroValue(); + Pixel1Type count{}; while (!it1.IsAtEnd()) { it1.Set(++count); diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx index f1ea06fe94d..2e194f9528a 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingBaseTest.cxx @@ -144,7 +144,7 @@ itkFastMarchingBaseTest(int argc, char * argv[]) double normalizationFactor = 1.0; ITK_TEST_SET_GET_VALUE(normalizationFactor, fmm->GetNormalizationFactor()); - auto targetReachedValue = itk::NumericTraits::ZeroValue(); + typename ImageFastMarching::OutputPixelType targetReachedValue{}; ITK_TEST_EXPECT_EQUAL(targetReachedValue, fmm->GetTargetReachedValue()); bool collectPoints = false; diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingImageTopologicalTest.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingImageTopologicalTest.cxx index 19ed5d83728..a303b7eccf1 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingImageTopologicalTest.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingImageTopologicalTest.cxx @@ -88,7 +88,7 @@ FastMarchingImageFilter(unsigned int argc, char * argv[]) return EXIT_FAILURE; } - LabelType label_zero = itk::NumericTraits::ZeroValue(); + LabelType label_zero{}; using ContourFilterType = itk::LabelContourImageFilter; auto contour = ContourFilterType::New(); diff --git a/Modules/Filtering/FastMarching/test/itkFastMarchingUpwindGradientBaseTest.cxx b/Modules/Filtering/FastMarching/test/itkFastMarchingUpwindGradientBaseTest.cxx index 932abb66fd8..f4ca0b837af 100644 --- a/Modules/Filtering/FastMarching/test/itkFastMarchingUpwindGradientBaseTest.cxx +++ b/Modules/Filtering/FastMarching/test/itkFastMarchingUpwindGradientBaseTest.cxx @@ -207,7 +207,7 @@ itkFastMarchingUpwindGradientBaseTest(int, char *[]) } criterion->SetTargetNodes(TargetNodes); - auto targetOffset = itk::NumericTraits::ZeroValue(); + typename CriterionType::OutputPixelType targetOffset{}; criterion->SetTargetOffset(targetOffset); ITK_TEST_SET_GET_VALUE(targetOffset, criterion->GetTargetOffset()); diff --git a/Modules/Filtering/ImageFeature/test/itkSimpleContourExtractorImageFilterTest.cxx b/Modules/Filtering/ImageFeature/test/itkSimpleContourExtractorImageFilterTest.cxx index 978749d902f..9ceac1570e5 100644 --- a/Modules/Filtering/ImageFeature/test/itkSimpleContourExtractorImageFilterTest.cxx +++ b/Modules/Filtering/ImageFeature/test/itkSimpleContourExtractorImageFilterTest.cxx @@ -72,7 +72,7 @@ itkSimpleContourExtractorImageFilterTest(int argc, char * argv[]) FilterType::InputPixelType inputForegroundValue = 255; FilterType::InputPixelType inputBackgroundValue = 0; FilterType::OutputPixelType outputForegroundValue = itk::NumericTraits::max(); - FilterType::OutputPixelType outputBackgroundValue = itk::NumericTraits::ZeroValue(); + FilterType::OutputPixelType outputBackgroundValue{}; filter->SetInputForegroundValue(inputForegroundValue); diff --git a/Modules/Filtering/ImageFilterBase/test/itkMaskNeighborhoodOperatorImageFilterTest.cxx b/Modules/Filtering/ImageFilterBase/test/itkMaskNeighborhoodOperatorImageFilterTest.cxx index 207006252dc..b0f24d15eec 100644 --- a/Modules/Filtering/ImageFilterBase/test/itkMaskNeighborhoodOperatorImageFilterTest.cxx +++ b/Modules/Filtering/ImageFilterBase/test/itkMaskNeighborhoodOperatorImageFilterTest.cxx @@ -107,7 +107,7 @@ itkMaskNeighborhoodOperatorImageFilterTest(int argc, char * argv[]) filter1->SetMaskImage(mask1); filter1->SetOperator(sobelHorizontal); - auto defaultValue = itk::NumericTraits::ZeroValue(); + typename FilterType::OutputPixelType defaultValue{}; filter1->SetDefaultValue(defaultValue); ITK_TEST_SET_GET_VALUE(defaultValue, filter1->GetDefaultValue()); diff --git a/Modules/Filtering/Path/include/itkPolyLineParametricPath.hxx b/Modules/Filtering/Path/include/itkPolyLineParametricPath.hxx index eacfbf4fd6d..09826e07e29 100644 --- a/Modules/Filtering/Path/include/itkPolyLineParametricPath.hxx +++ b/Modules/Filtering/Path/include/itkPolyLineParametricPath.hxx @@ -87,7 +87,7 @@ PolyLineParametricPath::IncrementInput(InputType & input) const -> O // Save this input index since we will use it to calculate the offset const IndexType originalIndex = this->EvaluateToIndex(input); - InputType potentialTimestep = itk::NumericTraits::ZeroValue(); + InputType potentialTimestep{}; bool timeStepSmallEnough = false; while (!timeStepSmallEnough) { diff --git a/Modules/Filtering/Path/test/itkExtractOrthogonalSwath2DImageFilterTest.cxx b/Modules/Filtering/Path/test/itkExtractOrthogonalSwath2DImageFilterTest.cxx index e99e219ba6b..4769eb4bce0 100644 --- a/Modules/Filtering/Path/test/itkExtractOrthogonalSwath2DImageFilterTest.cxx +++ b/Modules/Filtering/Path/test/itkExtractOrthogonalSwath2DImageFilterTest.cxx @@ -128,7 +128,7 @@ itkExtractOrthogonalSwath2DImageFilterTest(int argc, char * argv[]) extractOrthogonalSwath2DImageFilter, ExtractOrthogonalSwath2DImageFilter, ImageAndPathToImageFilter); - auto defaultPixelValue = itk::NumericTraits::ZeroValue(); + typename ImageType::PixelType defaultPixelValue{}; extractOrthogonalSwath2DImageFilter->SetDefaultPixelValue(defaultPixelValue); extractOrthogonalSwath2DImageFilter->SetImageInput(inputImage); diff --git a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx index 2837eab2e0b..9e7d83ea18b 100644 --- a/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx +++ b/Modules/Filtering/QuadEdgeMeshFiltering/test/itkCleanQuadEdgeMeshFilterTest.cxx @@ -66,7 +66,7 @@ itkCleanQuadEdgeMeshFilterTest(int argc, char * argv[]) filter->SetInput(mesh); - auto absTol = itk::NumericTraits::ZeroValue(); + typename CleanFilterType::InputCoordRepType absTol{}; filter->SetAbsoluteTolerance(absTol); ITK_TEST_SET_GET_VALUE(absTol, filter->GetAbsoluteTolerance()); diff --git a/Modules/IO/ImageBase/test/itkLargeImageWriteConvertReadTest.cxx b/Modules/IO/ImageBase/test/itkLargeImageWriteConvertReadTest.cxx index bb2c303b92f..bc95a7fcfeb 100644 --- a/Modules/IO/ImageBase/test/itkLargeImageWriteConvertReadTest.cxx +++ b/Modules/IO/ImageBase/test/itkLargeImageWriteConvertReadTest.cxx @@ -66,7 +66,7 @@ itkLargeImageWriteConvertReadTest(int argc, char * argv[]) IteratorType itr(image, region); itr.GoToBegin(); - OutputPixelType pixelValue = itk::NumericTraits::ZeroValue(); + OutputPixelType pixelValue{}; chronometer.Start("Initializing"); while (!itr.IsAtEnd()) diff --git a/Modules/IO/ImageBase/test/itkLargeImageWriteReadTest.cxx b/Modules/IO/ImageBase/test/itkLargeImageWriteReadTest.cxx index 61b2cd4e521..8ae9de3d97a 100644 --- a/Modules/IO/ImageBase/test/itkLargeImageWriteReadTest.cxx +++ b/Modules/IO/ImageBase/test/itkLargeImageWriteReadTest.cxx @@ -42,7 +42,6 @@ ActualTest(std::string filename, typename TImageType::SizeType size) typename ImageType::RegionType region; typename ImageType::IndexType index; - PixelType pixelValue; itk::TimeProbesCollectorBase chronometer; @@ -73,7 +72,7 @@ ActualTest(std::string filename, typename TImageType::SizeType size) IteratorType itr(image, region); itr.GoToBegin(); - pixelValue = itk::NumericTraits::ZeroValue(); + PixelType pixelValue{}; chronometer.Start("Initializing"); while (!itr.IsAtEnd()) @@ -127,7 +126,7 @@ ActualTest(std::string filename, typename TImageType::SizeType size) std::cout << "Comparing the pixel values..." << std::endl; - pixelValue = itk::NumericTraits::ZeroValue(); + PixelType pixelValue{}; chronometer.Start("Compare"); while (!ritr.IsAtEnd()) diff --git a/Modules/IO/MINC/test/itkMINCImageIOTest.cxx b/Modules/IO/MINC/test/itkMINCImageIOTest.cxx index 43aebb1e032..b936391f576 100644 --- a/Modules/IO/MINC/test/itkMINCImageIOTest.cxx +++ b/Modules/IO/MINC/test/itkMINCImageIOTest.cxx @@ -456,7 +456,7 @@ MINCReadWriteTest(const char * fileName, const char * minc_storage_type, double success = EXIT_FAILURE; } - int metaDataInt = itk::NumericTraits::ZeroValue(); + int metaDataInt{}; if (!itk::ExposeMetaData(metaDict2, "acquisition:TestInt", metaDataInt) || metaDataInt != 4) { std::cerr << "Failure reading metaData " @@ -705,7 +705,7 @@ MINCReadWriteTestVector(const char * fileName, success = EXIT_FAILURE; } - int metaDataInt = itk::NumericTraits::ZeroValue(); + int metaDataInt{}; if (!itk::ExposeMetaData(metaDict2, "acquisition:TestInt", metaDataInt) || metaDataInt != 4) { std::cerr << "Failure reading metaData " diff --git a/Modules/IO/MeshBYU/include/itkBYUMeshIO.h b/Modules/IO/MeshBYU/include/itkBYUMeshIO.h index 460fb628a98..806dd7d231d 100644 --- a/Modules/IO/MeshBYU/include/itkBYUMeshIO.h +++ b/Modules/IO/MeshBYU/include/itkBYUMeshIO.h @@ -119,7 +119,7 @@ class ITKIOMeshBYU_EXPORT BYUMeshIO : public MeshIOBase WritePoints(T * buffer, std::ofstream & outputFile) { Indent indent(1); - SizeValueType index = itk::NumericTraits::ZeroValue(); + SizeValueType index{}; for (SizeValueType ii = 0; ii < this->m_NumberOfPoints; ++ii) { @@ -137,7 +137,7 @@ class ITKIOMeshBYU_EXPORT BYUMeshIO : public MeshIOBase WriteCells(T * buffer, std::ofstream & outputFile) { Indent indent(7); - SizeValueType index = itk::NumericTraits::ZeroValue(); + SizeValueType index{}; for (SizeValueType ii = 0; ii < this->m_NumberOfCells; ++ii) { diff --git a/Modules/IO/MeshBYU/src/itkBYUMeshIO.cxx b/Modules/IO/MeshBYU/src/itkBYUMeshIO.cxx index 46e2e5a9b61..b28959e81cd 100644 --- a/Modules/IO/MeshBYU/src/itkBYUMeshIO.cxx +++ b/Modules/IO/MeshBYU/src/itkBYUMeshIO.cxx @@ -235,7 +235,7 @@ BYUMeshIO::ReadCells(void * buffer) inputFile.precision(12); auto * data = static_cast(buffer); SizeValueType numPoints = 0; - SizeValueType id = itk::NumericTraits::ZeroValue(); + SizeValueType id{}; SizeValueType index = 2; int ptId; m_FirstCellId -= 1; diff --git a/Modules/IO/MeshBase/include/itkMeshIOBase.h b/Modules/IO/MeshBase/include/itkMeshIOBase.h index 6f45b0c5e23..1bf98e0ef7f 100644 --- a/Modules/IO/MeshBase/include/itkMeshIOBase.h +++ b/Modules/IO/MeshBase/include/itkMeshIOBase.h @@ -738,8 +738,8 @@ class ITKIOMeshBase_EXPORT MeshIOBase : public LightProcessObject { if (input && output) { - SizeValueType inputIndex = itk::NumericTraits::ZeroValue(); - SizeValueType outputIndex = itk::NumericTraits::ZeroValue(); + SizeValueType inputIndex{}; + SizeValueType outputIndex{}; for (SizeValueType ii = 0; ii < m_NumberOfCells; ++ii) { diff --git a/Modules/IO/MeshOBJ/include/itkOBJMeshIO.h b/Modules/IO/MeshOBJ/include/itkOBJMeshIO.h index b2a4476bebf..cc03d9c8034 100644 --- a/Modules/IO/MeshOBJ/include/itkOBJMeshIO.h +++ b/Modules/IO/MeshOBJ/include/itkOBJMeshIO.h @@ -116,7 +116,7 @@ class ITKIOMeshOBJ_EXPORT OBJMeshIO : public MeshIOBase void WritePoints(T * buffer, std::ofstream & outputFile) { - SizeValueType index = itk::NumericTraits::ZeroValue(); + SizeValueType index{}; for (SizeValueType ii = 0; ii < this->m_NumberOfPoints; ++ii) { @@ -133,7 +133,7 @@ class ITKIOMeshOBJ_EXPORT OBJMeshIO : public MeshIOBase void WriteCells(T * buffer, std::ofstream & outputFile) { - SizeValueType index = itk::NumericTraits::ZeroValue(); + SizeValueType index{}; for (SizeValueType ii = 0; ii < this->m_NumberOfCells; ++ii) { @@ -154,7 +154,7 @@ class ITKIOMeshOBJ_EXPORT OBJMeshIO : public MeshIOBase void WritePointData(T * buffer, std::ofstream & outputFile) { - SizeValueType index = itk::NumericTraits::ZeroValue(); + SizeValueType index{}; for (SizeValueType ii = 0; ii < this->m_NumberOfPointPixels; ++ii) { diff --git a/Modules/IO/RAW/test/itkRawImageIOTest3.cxx b/Modules/IO/RAW/test/itkRawImageIOTest3.cxx index 766aed4a288..92db7b50705 100644 --- a/Modules/IO/RAW/test/itkRawImageIOTest3.cxx +++ b/Modules/IO/RAW/test/itkRawImageIOTest3.cxx @@ -65,7 +65,7 @@ itkRawImageIOTest3(int argc, char * argv[]) ImageIteratorType ii(image, region); - PixelType value = itk::NumericTraits::ZeroValue(); + PixelType value{}; ii.GoToBegin(); while (!ii.IsAtEnd()) { diff --git a/Modules/IO/RAW/test/itkRawImageIOTest4.cxx b/Modules/IO/RAW/test/itkRawImageIOTest4.cxx index 585889db066..c1c3cf2d198 100644 --- a/Modules/IO/RAW/test/itkRawImageIOTest4.cxx +++ b/Modules/IO/RAW/test/itkRawImageIOTest4.cxx @@ -76,7 +76,7 @@ class RawImageIOReadFileTester it.SetDirection(0); - PixelType value = itk::NumericTraits::ZeroValue(); + PixelType value{}; while (!it.IsAtEnd()) { while (!it.IsAtEndOfLine()) @@ -121,7 +121,7 @@ itkRawImageIOTest4(int argc, char * argv[]) using ComponentType = itk::PixelTraits::ValueType; using ByteSwapperType = itk::ByteSwapper; - PixelType value = itk::NumericTraits::ZeroValue(); + PixelType value{}; unsigned int numberOfPixels = dims[0] * dims[1]; diff --git a/Modules/IO/RAW/test/itkRawImageIOTest5.cxx b/Modules/IO/RAW/test/itkRawImageIOTest5.cxx index 152580f2afe..349f2a8720a 100644 --- a/Modules/IO/RAW/test/itkRawImageIOTest5.cxx +++ b/Modules/IO/RAW/test/itkRawImageIOTest5.cxx @@ -54,7 +54,7 @@ class RawImageReaderAndWriter m_Image->SetRegions(region); m_Image->Allocate(); - PixelType value = itk::NumericTraits::ZeroValue(); + PixelType value{}; // Fill the image with incremental values. using IteratorType = itk::ImageRegionIterator; diff --git a/Modules/IO/TIFF/test/itkLargeTIFFImageWriteReadTest.cxx b/Modules/IO/TIFF/test/itkLargeTIFFImageWriteReadTest.cxx index c9da28ea041..3a6ef59434c 100644 --- a/Modules/IO/TIFF/test/itkLargeTIFFImageWriteReadTest.cxx +++ b/Modules/IO/TIFF/test/itkLargeTIFFImageWriteReadTest.cxx @@ -45,8 +45,6 @@ itkLargeTIFFImageWriteReadTestHelper(std::string filename, typename TImage::Size typename ImageType::RegionType region; typename ImageType::IndexType index; - PixelType pixelValue; - itk::TimeProbesCollectorBase chronometer; { @@ -82,7 +80,7 @@ itkLargeTIFFImageWriteReadTestHelper(std::string filename, typename TImage::Size IteratorType itr(image, region); itr.GoToBegin(); - pixelValue = itk::NumericTraits::ZeroValue(); + PixelType pixelValue{}; chronometer.Start("Initializing"); while (!itr.IsAtEnd()) @@ -129,7 +127,7 @@ itkLargeTIFFImageWriteReadTestHelper(std::string filename, typename TImage::Size std::cout << "Comparing the pixel values..." << std::endl; - pixelValue = itk::NumericTraits::ZeroValue(); + PixelType pixelValue{}; chronometer.Start("Compare"); while (!ritr.IsAtEnd()) diff --git a/Modules/Nonunit/Review/include/itkDiscreteGradientMagnitudeGaussianImageFunction.hxx b/Modules/Nonunit/Review/include/itkDiscreteGradientMagnitudeGaussianImageFunction.hxx index 2408993dff0..e83fceb11cf 100644 --- a/Modules/Nonunit/Review/include/itkDiscreteGradientMagnitudeGaussianImageFunction.hxx +++ b/Modules/Nonunit/Review/include/itkDiscreteGradientMagnitudeGaussianImageFunction.hxx @@ -182,7 +182,7 @@ auto DiscreteGradientMagnitudeGaussianImageFunction::EvaluateAtIndex(const IndexType & index) const -> OutputType { - OutputType gradientMagnitude = itk::NumericTraits::ZeroValue(); + OutputType gradientMagnitude{}; OutputType temp; for (unsigned int i = 0; i < m_KernelArray.Size(); ++i) diff --git a/Modules/Nonunit/Review/test/itkGridForwardWarpImageFilterTest.cxx b/Modules/Nonunit/Review/test/itkGridForwardWarpImageFilterTest.cxx index a1d1af6524e..7d66c1f89a5 100644 --- a/Modules/Nonunit/Review/test/itkGridForwardWarpImageFilterTest.cxx +++ b/Modules/Nonunit/Review/test/itkGridForwardWarpImageFilterTest.cxx @@ -102,7 +102,7 @@ itkGridForwardWarpImageFilterTest(int argc, char * argv[]) ITK_EXERCISE_BASIC_OBJECT_METHODS(filter, GridForwardWarpImageFilter, ImageToImageFilter); - FilterType::PixelType backgroundValue = itk::NumericTraits::ZeroValue(); + FilterType::PixelType backgroundValue{}; filter->SetBackgroundValue(backgroundValue); ITK_TEST_SET_GET_VALUE(backgroundValue, filter->GetBackgroundValue()); diff --git a/Modules/Nonunit/Review/test/itkMultiphaseSparseFiniteDifferenceImageFilterTest.cxx b/Modules/Nonunit/Review/test/itkMultiphaseSparseFiniteDifferenceImageFilterTest.cxx index 3cc54d5262d..6dd8369c5b8 100644 --- a/Modules/Nonunit/Review/test/itkMultiphaseSparseFiniteDifferenceImageFilterTest.cxx +++ b/Modules/Nonunit/Review/test/itkMultiphaseSparseFiniteDifferenceImageFilterTest.cxx @@ -123,7 +123,7 @@ itkMultiphaseSparseFiniteDifferenceImageFilterTest(int, char *[]) using ValueType = typename FilterType::ValueType; - ValueType isoSurfaceValue = itk::NumericTraits::ZeroValue(); + ValueType isoSurfaceValue{}; filter->SetIsoSurfaceValue(isoSurfaceValue); ITK_TEST_SET_GET_VALUE(isoSurfaceValue, filter->GetIsoSurfaceValue()); diff --git a/Modules/Numerics/Optimizersv4/include/itkConjugateGradientLineSearchOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkConjugateGradientLineSearchOptimizerv4.hxx index 99bb0f7df20..06f152e6f02 100644 --- a/Modules/Numerics/Optimizersv4/include/itkConjugateGradientLineSearchOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkConjugateGradientLineSearchOptimizerv4.hxx @@ -60,7 +60,7 @@ ConjugateGradientLineSearchOptimizerv4Template::A this->EstimateLearningRate(); } - TInternalComputationValueType gamma = itk::NumericTraits::ZeroValue(); + TInternalComputationValueType gamma{}; TInternalComputationValueType gammaDenom = inner_product(this->m_LastGradient, this->m_LastGradient); if (gammaDenom > itk::NumericTraits::epsilon()) { diff --git a/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.hxx b/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.hxx index 6466cf4ce04..081991f763e 100644 --- a/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.hxx +++ b/Modules/Numerics/Statistics/include/itkStandardDeviationPerComponentSampleFilter.hxx @@ -144,7 +144,7 @@ StandardDeviationPerComponentSampleFilter::GenerateData() typename TSample::AbsoluteFrequencyType frequency; using TotalAbsoluteFrequencyType = typename TSample::TotalAbsoluteFrequencyType; - TotalAbsoluteFrequencyType totalFrequency = itk::NumericTraits::ZeroValue(); + TotalAbsoluteFrequencyType totalFrequency{}; typename TSample::ConstIterator iter = input->Begin(); typename TSample::ConstIterator end = input->End(); diff --git a/Modules/Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4SpeedTest.cxx b/Modules/Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4SpeedTest.cxx index a15d2a5c388..5cb8c9e153a 100644 --- a/Modules/Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4SpeedTest.cxx +++ b/Modules/Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4SpeedTest.cxx @@ -122,7 +122,7 @@ itkMeanSquaresImageToImageMetricv4SpeedTest(int argc, char * argv[]) MetricType::MeasureType valueReturn1; MetricType::DerivativeType derivativeReturn; - MetricType::MeasureType sum = itk::NumericTraits::ZeroValue(); + MetricType::MeasureType sum{}; for (int r = 0; r < numberOfReps; ++r) { metric->GetValueAndDerivative(valueReturn1, derivativeReturn); diff --git a/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4Test.cxx b/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4Test.cxx index 0cba55b6651..aa410c60bc2 100644 --- a/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4Test.cxx +++ b/Modules/Registration/Metricsv4/test/itkObjectToObjectMultiMetricv4Test.cxx @@ -124,8 +124,8 @@ itkObjectToObjectMultiMetricv4TestEvaluate(ObjectToObjectMultiMetricv4TestMultiM } // Evaluate individually - MeasureType metricValue = itk::NumericTraits::ZeroValue(); - MeasureType weightedMetricValue = itk::NumericTraits::ZeroValue(); + MeasureType metricValue{}; + MeasureType weightedMetricValue{}; MultiMetricType::DerivativeType metricDerivative; MultiMetricType::DerivativeType DerivResultOfGetValueAndDerivativeTruth(multiVariateMetric->GetNumberOfParameters()); DerivResultOfGetValueAndDerivativeTruth.Fill(itk::NumericTraits::ZeroValue()); diff --git a/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h b/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h index 8aaaa540e90..c6d632ffa72 100644 --- a/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h +++ b/Modules/Segmentation/ConnectedComponents/include/itkVectorConnectedComponentImageFilter.h @@ -51,7 +51,7 @@ template class SimilarVectorsFunctor { public: - SimilarVectorsFunctor() { m_Threshold = itk::NumericTraits::ZeroValue(); } + SimilarVectorsFunctor() = default; ~SimilarVectorsFunctor() = default; @@ -87,7 +87,7 @@ class SimilarVectorsFunctor } protected: - typename TInput::ValueType m_Threshold; + typename TInput::ValueType m_Threshold{}; }; } // end namespace Functor diff --git a/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterTest.cxx b/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterTest.cxx index 3cd3a448809..c473e443041 100644 --- a/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterTest.cxx +++ b/Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterTest.cxx @@ -89,7 +89,7 @@ itkConnectedComponentImageFilterTest(int argc, char * argv[]) } ITK_TEST_SET_GET_BOOLEAN(filter, FullyConnected, fullyConnected); - auto backgroundValue = itk::NumericTraits::ZeroValue(); + typename FilterType::OutputPixelType backgroundValue{}; filter->SetBackgroundValue(backgroundValue); ITK_TEST_SET_GET_VALUE(backgroundValue, filter->GetBackgroundValue()); diff --git a/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.hxx b/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.hxx index 0083b90a071..569ac09b3f2 100644 --- a/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.hxx +++ b/Modules/Segmentation/RegionGrowing/include/itkConfidenceConnectedImageFilter.hxx @@ -158,7 +158,7 @@ ConfidenceConnectedImageFilter::GenerateData() auto neighborhoodRange = ShapedImageNeighborhoodRange(*inputImage, IndexType(), neighborhoodOffsets); - InputRealType sumOfSquares = itk::NumericTraits::ZeroValue(); + InputRealType sumOfSquares{}; typename SeedsContainerType::const_iterator si = m_Seeds.begin(); typename SeedsContainerType::const_iterator li = m_Seeds.end(); @@ -199,8 +199,8 @@ ConfidenceConnectedImageFilter::GenerateData() } else { - InputRealType sum = itk::NumericTraits::ZeroValue(); - InputRealType sumOfSquares = itk::NumericTraits::ZeroValue(); + InputRealType sum{}; + InputRealType sumOfSquares{}; typename SeedsContainerType::const_iterator si = m_Seeds.begin(); typename SeedsContainerType::const_iterator li = m_Seeds.end(); diff --git a/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx b/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx index 1a5fb39e8cf..0fd097d657d 100644 --- a/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx +++ b/Modules/Video/BridgeOpenCV/test/itkOpenCVImageBridgeRGBTest.cxx @@ -67,7 +67,7 @@ RGBImageTotalAbsDifference(const itk::Image, VDimensi return 1; } - TPixelValue localDiff = itk::NumericTraits::ZeroValue(); + TPixelValue localDiff{}; for (unsigned int i = 0; i < 3; ++i) {