From aef6384d6174dff196df8be4554500363b709f63 Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Tue, 16 Mar 2021 13:29:40 -0400 Subject: [PATCH 1/2] BUG: Initialize member variables This will close defects in itkHausdorffDistanceImageFilterTest, itkDirectedHausdorffDistanceImageFilterTest, itkBasicFiltersPrintTest. Co-Authored-By: Mihail Isakov --- .../include/itkDirectedHausdorffDistanceImageFilter.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h b/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h index e23f02e78d7..64fdc244993 100644 --- a/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h @@ -180,8 +180,8 @@ class ITK_TEMPLATE_EXPORT DirectedHausdorffDistanceImageFilter : public ImageToI DistanceMapPointer m_DistanceMap; - RealType m_MaxDistance; - IdentifierType m_PixelCount; + RealType m_MaxDistance{ NumericTraits::ZeroValue() }; + IdentifierType m_PixelCount{}; using CompensatedSummationType = itk::CompensatedSummation; CompensatedSummationType m_Sum; From 7e77b7903d2875abd8a2b6ffb465cecfeb01151c Mon Sep 17 00:00:00 2001 From: Bradley Lowekamp Date: Tue, 16 Mar 2021 13:35:12 -0400 Subject: [PATCH 2/2] STYLE: Prefer in class initialization --- .../include/itkDirectedHausdorffDistanceImageFilter.h | 8 ++++---- .../include/itkDirectedHausdorffDistanceImageFilter.hxx | 8 +------- .../include/itkHausdorffDistanceImageFilter.hxx | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h b/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h index 64fdc244993..76be5f568ed 100644 --- a/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h +++ b/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.h @@ -178,7 +178,7 @@ class ITK_TEMPLATE_EXPORT DirectedHausdorffDistanceImageFilter : public ImageToI using DistanceMapPointer = typename DistanceMapType::Pointer; - DistanceMapPointer m_DistanceMap; + DistanceMapPointer m_DistanceMap{ nullptr }; RealType m_MaxDistance{ NumericTraits::ZeroValue() }; IdentifierType m_PixelCount{}; @@ -186,9 +186,9 @@ class ITK_TEMPLATE_EXPORT DirectedHausdorffDistanceImageFilter : public ImageToI using CompensatedSummationType = itk::CompensatedSummation; CompensatedSummationType m_Sum; - RealType m_DirectedHausdorffDistance; - RealType m_AverageHausdorffDistance; - bool m_UseImageSpacing; + RealType m_DirectedHausdorffDistance{ NumericTraits::ZeroValue() }; + RealType m_AverageHausdorffDistance{ NumericTraits::ZeroValue() }; + bool m_UseImageSpacing{ true }; std::mutex m_Mutex; }; // end of class diff --git a/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.hxx b/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.hxx index 70f87f28aa5..7111b0ff5fd 100644 --- a/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.hxx +++ b/Modules/Filtering/DistanceMap/include/itkDirectedHausdorffDistanceImageFilter.hxx @@ -34,12 +34,6 @@ DirectedHausdorffDistanceImageFilter::DirectedHausdo // this filter requires two input images this->SetNumberOfRequiredInputs(2); - m_DistanceMap = nullptr; - m_DirectedHausdorffDistance = NumericTraits::ZeroValue(); - m_AverageHausdorffDistance = NumericTraits::ZeroValue(); - m_UseImageSpacing = true; - - this->DynamicMultiThreadingOn(); this->ThreaderUpdateProgressOff(); } @@ -214,7 +208,7 @@ DirectedHausdorffDistanceImageFilter::PrintSelf(std: << static_cast::PrintType>(m_DirectedHausdorffDistance) << std::endl; os << indent << "AverageHausdorffDistance: " << static_cast::PrintType>(m_AverageHausdorffDistance) << std::endl; - os << indent << "UseImageSpacing : " << m_UseImageSpacing << std::endl; + os << indent << "UseImageSpacing: " << m_UseImageSpacing << std::endl; } } // end namespace itk #endif diff --git a/Modules/Filtering/DistanceMap/include/itkHausdorffDistanceImageFilter.hxx b/Modules/Filtering/DistanceMap/include/itkHausdorffDistanceImageFilter.hxx index e73c5c95876..f0671e81182 100644 --- a/Modules/Filtering/DistanceMap/include/itkHausdorffDistanceImageFilter.hxx +++ b/Modules/Filtering/DistanceMap/include/itkHausdorffDistanceImageFilter.hxx @@ -153,7 +153,7 @@ HausdorffDistanceImageFilter::PrintSelf(std::ostream os << indent << "HausdorffDistance: " << m_HausdorffDistance << std::endl; os << indent << "AverageHausdorffDistance: " << m_AverageHausdorffDistance << std::endl; - os << indent << "Use Image Spacing : " << m_UseImageSpacing << std::endl; + os << indent << "Use Image Spacing: " << m_UseImageSpacing << std::endl; } } // end namespace itk #endif