Default default-constructor of ConstantBoundaryCondition and other Core/Common class templates

Modules/Core/Common/include/itkBinaryThresholdSpatialFunction.h

@@ -87,13 +87,13 @@ class ITK_TEMPLATE_EXPORT BinaryThresholdSpatialFunction
   Evaluate(const InputType & point) const override;
 
 protected:
-  BinaryThresholdSpatialFunction();
+  BinaryThresholdSpatialFunction() = default;
   ~BinaryThresholdSpatialFunction() override = default;
   void
   PrintSelf(std::ostream & os, Indent indent) const override;
 
-  FunctionOutputType m_LowerThreshold{};
-  FunctionOutputType m_UpperThreshold{};
+  FunctionOutputType m_LowerThreshold{ NumericTraits<FunctionOutputType>::NonpositiveMin() };
+  FunctionOutputType m_UpperThreshold{ NumericTraits<FunctionOutputType>::max() };
 
   typename FunctionType::Pointer m_Function{};
 };

Modules/Core/Common/include/itkBinaryThresholdSpatialFunction.hxx

@@ -21,13 +21,6 @@
 
 namespace itk
 {
-template <typename TFunction>
-BinaryThresholdSpatialFunction<TFunction>::BinaryThresholdSpatialFunction()
-{
-  m_LowerThreshold = NumericTraits<FunctionOutputType>::NonpositiveMin();
-  m_UpperThreshold = NumericTraits<FunctionOutputType>::max();
-  m_Function = nullptr;
-}
 
 template <typename TFunction>
 void

Modules/Core/Common/include/itkCompensatedSummation.h

@@ -76,7 +76,7 @@ class ITK_TEMPLATE_EXPORT CompensatedSummation
   using Self = CompensatedSummation;
 
   /** Constructors. */
-  CompensatedSummation();
+  CompensatedSummation() = default;
   CompensatedSummation(FloatType value);
 
   /** Copy constructor. */
@@ -120,8 +120,8 @@ class ITK_TEMPLATE_EXPORT CompensatedSummation
   explicit operator FloatType() const;
 
 private:
-  AccumulateType m_Sum;
-  AccumulateType m_Compensation;
+  AccumulateType m_Sum{};
+  AccumulateType m_Compensation{};
 
 // Maybe support more types in the future with template specialization.
 #ifdef ITK_USE_CONCEPT_CHECKING

Modules/Core/Common/include/itkCompensatedSummation.hxx

@@ -58,13 +58,6 @@ CompensatedSummationAddElement(TFloat & compensation, TFloat & sum, const TFloat
 #  endif // _MSC_VER
 #endif   // not itkCompensatedSummation_cxx
 
-template <typename TFloat>
-CompensatedSummation<TFloat>::CompensatedSummation()
-  : m_Sum(NumericTraits<AccumulateType>::ZeroValue())
-  , m_Compensation(NumericTraits<AccumulateType>::ZeroValue())
-{}
-
-
 template <typename TFloat>
 CompensatedSummation<TFloat>::CompensatedSummation(const TFloat value)
   : m_Sum(value)

Modules/Core/Common/include/itkConstNeighborhoodIterator.h

@@ -98,7 +98,7 @@ class ITK_TEMPLATE_EXPORT ConstNeighborhoodIterator
   using ImageBoundaryConditionConstPointerType = const ImageBoundaryCondition<ImageType, OutputImageType> *;
 
   /** Default constructor */
-  ConstNeighborhoodIterator();
+  ConstNeighborhoodIterator() = default;
 
   /** Virtual destructor */
   ~ConstNeighborhoodIterator() override = default;
@@ -612,11 +612,14 @@ class ITK_TEMPLATE_EXPORT ConstNeighborhoodIterator
    *  within the buffer. */
   OffsetType m_WrapOffset{ { 0 } };
 
+  /** Default boundary condition. */
+  TBoundaryCondition m_InternalBoundaryCondition{};
+
   /** Pointer to the actual boundary condition that will be used.
    * By default this points to m_BoundaryCondition, but
    * OverrideBoundaryCondition allows a user to point this variable an external
    * boundary condition.  */
-  ImageBoundaryConditionPointerType m_BoundaryCondition{};
+  ImageBoundaryConditionPointerType m_BoundaryCondition{ &m_InternalBoundaryCondition };
 
   /** Denotes which of the iterators dimensional sides spill outside
    * region of interest boundaries. By default `false` for each dimension. */
@@ -636,9 +639,6 @@ class ITK_TEMPLATE_EXPORT ConstNeighborhoodIterator
   /** Upper threshold of in-bounds loop counter values. */
   IndexType m_InnerBoundsHigh{};
 
-  /** Default boundary condition. */
-  TBoundaryCondition m_InternalBoundaryCondition{};
-
   /** Does the specified region need to worry about boundary conditions? */
   bool m_NeedToUseBoundaryCondition{ false };
 

Modules/Core/Common/include/itkConstNeighborhoodIterator.hxx

@@ -206,12 +206,6 @@ ConstNeighborhoodIterator<TImage, TBoundaryCondition>::GetBoundingBoxAsImageRegi
   return ans;
 }
 
-template <typename TImage, typename TBoundaryCondition>
-ConstNeighborhoodIterator<TImage, TBoundaryCondition>::ConstNeighborhoodIterator()
-{
-  m_BoundaryCondition = &m_InternalBoundaryCondition;
-}
-
 template <typename TImage, typename TBoundaryCondition>
 ConstNeighborhoodIterator<TImage, TBoundaryCondition>::ConstNeighborhoodIterator(const Self & orig)
   : Neighborhood<InternalPixelType *, Dimension>(orig)

Modules/Core/Common/include/itkConstantBoundaryCondition.h

@@ -91,7 +91,7 @@ class ITK_TEMPLATE_EXPORT ConstantBoundaryCondition : public ImageBoundaryCondit
   static constexpr unsigned int ImageDimension = Superclass::ImageDimension;
 
   /** Default constructor. */
-  ConstantBoundaryCondition();
+  ConstantBoundaryCondition() = default;
 
   /** Utility for printing the boundary condition. */
   void

Modules/Core/Common/include/itkConstantBoundaryCondition.hxx

@@ -22,13 +22,6 @@
 namespace itk
 {
 
-template <typename TInputImage, typename TOutputImage>
-ConstantBoundaryCondition<TInputImage, TOutputImage>::ConstantBoundaryCondition()
-{
-  OutputPixelType p{};
-  m_Constant = NumericTraits<OutputPixelType>::ZeroValue(p);
-}
-
 template <typename TInputImage, typename TOutputImage>
 typename ConstantBoundaryCondition<TInputImage, TOutputImage>::OutputPixelType
 ConstantBoundaryCondition<TInputImage, TOutputImage>::operator()(const OffsetType &,

Modules/Core/Common/include/itkEllipsoidInteriorExteriorSpatialFunction.h

@@ -81,7 +81,7 @@ class ITK_TEMPLATE_EXPORT EllipsoidInteriorExteriorSpatialFunction
   Evaluate(const InputType & position) const override;
 
 protected:
-  EllipsoidInteriorExteriorSpatialFunction();
+  EllipsoidInteriorExteriorSpatialFunction() = default;
   ~EllipsoidInteriorExteriorSpatialFunction() override = default;
 
   void
@@ -92,7 +92,7 @@ class ITK_TEMPLATE_EXPORT EllipsoidInteriorExteriorSpatialFunction
   InputType m_Center{};
 
   /** The axes lengths of the ellipsoid. */
-  InputType m_Axes{};
+  InputType m_Axes{ MakeFilled<InputType>(1.0f) };
 
   /** The orientation vectors (must be orthogonal) of the ellipsoid axes. */
   OrientationType m_Orientations{};

Modules/Core/Common/include/itkEllipsoidInteriorExteriorSpatialFunction.hxx

@@ -22,13 +22,6 @@
 
 namespace itk
 {
-template <unsigned int VDimension, typename TInput>
-EllipsoidInteriorExteriorSpatialFunction<VDimension, TInput>::EllipsoidInteriorExteriorSpatialFunction()
-{
-  m_Axes.Fill(1.0f);   // Lengths of ellipsoid axes.
-  m_Center.Fill(0.0f); // Origin of ellipsoid
-}
-
 template <unsigned int VDimension, typename TInput>
 auto
 EllipsoidInteriorExteriorSpatialFunction<VDimension, TInput>::Evaluate(const InputType & position) const -> OutputType

Modules/Core/Common/include/itkGaussianDerivativeSpatialFunction.h

@@ -91,7 +91,7 @@ class ITK_TEMPLATE_EXPORT GaussianDerivativeSpatialFunction : public SpatialFunc
   itkGetConstMacro(Direction, unsigned int);
 
 protected:
-  GaussianDerivativeSpatialFunction();
+  GaussianDerivativeSpatialFunction() = default;
   ~GaussianDerivativeSpatialFunction() override = default;
   void
   PrintSelf(std::ostream & os, Indent indent) const override;
@@ -101,13 +101,13 @@ class ITK_TEMPLATE_EXPORT GaussianDerivativeSpatialFunction : public SpatialFunc
   mutable unsigned int m_Direction{};
 
   /** The standard deviation in each direction. */
-  ArrayType m_Sigma{};
+  ArrayType m_Sigma{ ArrayType::Filled(1.0) };
 
   /** The mean in each direction. */
   ArrayType m_Mean{};
 
   /** A scale factor multiplied by the true value of the Gaussian. */
-  double m_Scale{};
+  double m_Scale{ 1.0 };
 
   /** Whether or not to normalize the Gaussian. */
   bool m_Normalized{};

Modules/Core/Common/include/itkGaussianDerivativeSpatialFunction.hxx

@@ -23,16 +23,6 @@
 
 namespace itk
 {
-template <typename TOutput, unsigned int VImageDimension, typename TInput>
-GaussianDerivativeSpatialFunction<TOutput, VImageDimension, TInput>::GaussianDerivativeSpatialFunction()
-{
-  m_Mean = ArrayType::Filled(0.0);
-  m_Sigma = ArrayType::Filled(1.0);
-  m_Scale = 1.0;
-  m_Normalized = false;
-  m_Direction = 0;
-}
-
 template <typename TOutput, unsigned int VImageDimension, typename TInput>
 auto
 GaussianDerivativeSpatialFunction<TOutput, VImageDimension, TInput>::Evaluate(const TInput & position) const

Modules/Core/Common/include/itkGaussianSpatialFunction.h

@@ -89,15 +89,15 @@ class ITK_TEMPLATE_EXPORT GaussianSpatialFunction : public SpatialFunction<TOutp
   itkGetConstMacro(Mean, ArrayType);
 
 protected:
-  GaussianSpatialFunction();
+  GaussianSpatialFunction() = default;
   ~GaussianSpatialFunction() override = default;
   void
   PrintSelf(std::ostream & os, Indent indent) const override;
 
 private:
-  ArrayType m_Sigma{};
+  ArrayType m_Sigma{ ArrayType::Filled(5.0) };
 
-  ArrayType m_Mean{};
+  ArrayType m_Mean{ ArrayType::Filled(10.0) };
 
   double m_Scale{ 1.0 };
 

Modules/Core/Common/include/itkGaussianSpatialFunction.hxx

@@ -23,14 +23,6 @@
 
 namespace itk
 {
-template <typename TOutput, unsigned int VImageDimension, typename TInput>
-GaussianSpatialFunction<TOutput, VImageDimension, TInput>::GaussianSpatialFunction()
-
-{
-  m_Mean = ArrayType::Filled(10.0);
-  m_Sigma = ArrayType::Filled(5.0);
-}
-
 template <typename TOutput, unsigned int VImageDimension, typename TInput>
 auto
 GaussianSpatialFunction<TOutput, VImageDimension, TInput>::Evaluate(const TInput & position) const -> OutputType

Modules/Core/Common/include/itkImage.h

@@ -374,7 +374,7 @@ class ITK_TEMPLATE_EXPORT Image : public ImageBase<VImageDimension>
   }
 
 protected:
-  Image();
+  Image() = default;
   void
   PrintSelf(std::ostream & os, Indent indent) const override;
   void
@@ -393,7 +393,7 @@ class ITK_TEMPLATE_EXPORT Image : public ImageBase<VImageDimension>
 
 private:
   /** Memory for the current buffer. */
-  PixelContainerPointer m_Buffer{};
+  PixelContainerPointer m_Buffer{ PixelContainer::New() };
 };
 } // end namespace itk
 

Modules/Core/Common/include/itkImage.hxx

@@ -34,13 +34,6 @@
 namespace itk
 {
 
-template <typename TPixel, unsigned int VImageDimension>
-Image<TPixel, VImageDimension>::Image()
-{
-  m_Buffer = PixelContainer::New();
-}
-
-
 template <typename TPixel, unsigned int VImageDimension>
 void
 Image<TPixel, VImageDimension>::Allocate(bool initializePixels)

Modules/Core/Common/include/itkImageRandomConstIteratorWithIndex.h

@@ -136,7 +136,7 @@ class ITK_TEMPLATE_EXPORT ImageRandomConstIteratorWithIndex : public ImageConstI
   using typename Superclass::SizeValueType;
 
   /** Default constructor. Needed since we provide a cast constructor. */
-  ImageRandomConstIteratorWithIndex();
+  ImageRandomConstIteratorWithIndex() = default;
   ~ImageRandomConstIteratorWithIndex() override = default;
 
   /** Constructor establishes an iterator to walk a particular image and a
@@ -224,7 +224,7 @@ class ITK_TEMPLATE_EXPORT ImageRandomConstIteratorWithIndex : public ImageConstI
   RandomJump();
 
   using GeneratorPointer = typename Statistics::MersenneTwisterRandomVariateGenerator::Pointer;
-  GeneratorPointer m_Generator{};
+  GeneratorPointer m_Generator{ Statistics::MersenneTwisterRandomVariateGenerator::New() };
   SizeValueType    m_NumberOfSamplesRequested{};
   SizeValueType    m_NumberOfSamplesDone{};
   SizeValueType    m_NumberOfPixelsInRegion{};

Modules/Core/Common/include/itkImageRandomConstIteratorWithIndex.hxx

@@ -22,16 +22,6 @@
 namespace itk
 {
 
-template <typename TImage>
-ImageRandomConstIteratorWithIndex<TImage>::ImageRandomConstIteratorWithIndex()
-  : ImageConstIteratorWithIndex<TImage>()
-{
-  m_NumberOfPixelsInRegion = 0L;
-  m_NumberOfSamplesRequested = 0L;
-  m_NumberOfSamplesDone = 0L;
-  m_Generator = Statistics::MersenneTwisterRandomVariateGenerator::New();
-}
-
 template <typename TImage>
 ImageRandomConstIteratorWithIndex<TImage>::ImageRandomConstIteratorWithIndex(const ImageType *  ptr,
                                                                              const RegionType & region)

Modules/Core/Common/include/itkImageRandomConstIteratorWithOnlyIndex.h

@@ -138,7 +138,7 @@ class ITK_TEMPLATE_EXPORT ImageRandomConstIteratorWithOnlyIndex : public ImageCo
   using typename Superclass::SizeValueType;
 
   /** Default constructor. Needed since we provide a cast constructor. */
-  ImageRandomConstIteratorWithOnlyIndex();
+  ImageRandomConstIteratorWithOnlyIndex() = default;
   ~ImageRandomConstIteratorWithOnlyIndex() override = default;
 
   /** Constructor establishes an iterator to walk a particular image and a
@@ -226,7 +226,7 @@ class ITK_TEMPLATE_EXPORT ImageRandomConstIteratorWithOnlyIndex : public ImageCo
   RandomJump();
 
   using GeneratorPointer = typename Statistics::MersenneTwisterRandomVariateGenerator::Pointer;
-  GeneratorPointer m_Generator{};
+  GeneratorPointer m_Generator{ Statistics::MersenneTwisterRandomVariateGenerator::New() };
   SizeValueType    m_NumberOfSamplesRequested{};
   SizeValueType    m_NumberOfSamplesDone{};
   SizeValueType    m_NumberOfPixelsInRegion{};

Modules/Core/Common/include/itkImageRandomConstIteratorWithOnlyIndex.hxx

@@ -22,16 +22,6 @@
 namespace itk
 {
 
-template <typename TImage>
-ImageRandomConstIteratorWithOnlyIndex<TImage>::ImageRandomConstIteratorWithOnlyIndex()
-  : ImageConstIteratorWithOnlyIndex<TImage>()
-{
-  m_NumberOfPixelsInRegion = 0L;
-  m_NumberOfSamplesRequested = 0L;
-  m_NumberOfSamplesDone = 0L;
-  m_Generator = Statistics::MersenneTwisterRandomVariateGenerator::New();
-}
-
 template <typename TImage>
 ImageRandomConstIteratorWithOnlyIndex<TImage>::ImageRandomConstIteratorWithOnlyIndex(const ImageType *  ptr,
                                                                                      const RegionType & region)

Modules/Core/Common/include/itkImageRandomNonRepeatingConstIteratorWithIndex.h

@@ -234,7 +234,7 @@ class ITK_TEMPLATE_EXPORT ImageRandomNonRepeatingConstIteratorWithIndex : public
   using typename Superclass::SizeValueType;
 
   /** Default constructor. Needed since we provide a cast constructor. */
-  ImageRandomNonRepeatingConstIteratorWithIndex();
+  ImageRandomNonRepeatingConstIteratorWithIndex() = default;
   ~ImageRandomNonRepeatingConstIteratorWithIndex() override { delete m_Permutation; }
 
   /** Constructor establishes an iterator to walk a particular image and a
@@ -343,10 +343,10 @@ class ITK_TEMPLATE_EXPORT ImageRandomNonRepeatingConstIteratorWithIndex : public
   void
   UpdatePosition();
 
-  SizeValueType       m_NumberOfSamplesRequested;
-  SizeValueType       m_NumberOfSamplesDone;
-  SizeValueType       m_NumberOfPixelsInRegion;
-  RandomPermutation * m_Permutation;
+  SizeValueType       m_NumberOfSamplesRequested{};
+  SizeValueType       m_NumberOfSamplesDone{};
+  SizeValueType       m_NumberOfPixelsInRegion{};
+  RandomPermutation * m_Permutation{};
 };
 } // end namespace itk
 

Modules/Core/Common/include/itkImageRandomNonRepeatingConstIteratorWithIndex.hxx

@@ -22,16 +22,6 @@
 namespace itk
 {
 
-template <typename TImage>
-ImageRandomNonRepeatingConstIteratorWithIndex<TImage>::ImageRandomNonRepeatingConstIteratorWithIndex()
-  : ImageConstIteratorWithIndex<TImage>()
-{
-  m_NumberOfPixelsInRegion = 0L;
-  m_NumberOfSamplesRequested = 0L;
-  m_NumberOfSamplesDone = 0L;
-  m_Permutation = nullptr;
-}
-
 template <typename TImage>
 ImageRandomNonRepeatingConstIteratorWithIndex<TImage>::ImageRandomNonRepeatingConstIteratorWithIndex(
   const ImageType *  ptr,

Modules/Core/Common/include/itkImageVectorOptimizerParametersHelper.h

@@ -50,7 +50,7 @@ class ITK_TEMPLATE_EXPORT ImageVectorOptimizerParametersHelper : public Optimize
   using typename Superclass::CommonContainerType;
 
   /** Default constructor. */
-  ImageVectorOptimizerParametersHelper();
+  ImageVectorOptimizerParametersHelper() = default;
 
   /** Set a new data pointer for *both* the Array and parameter image,
    * pointing both to a different memory block.