STYLE: Use MakeFilled in any fixed array NumericTraits specialization

Uses MakeFilled in the `NumericTraits` specializations of "fixed array" classes: CovariantVector, DiffusionTensor3D, FixedArray, and SymmetricSecondRankTensor. Follow-up to: pull request #3262 commit 82001f3 "STYLE: Use MakeFilled, () or {}, instead of `Vector(const ValueType &)`"
InsightSoftwareConsortium · Mar 12, 2022 · 908a29a · 908a29a
1 parent fa58a4d
commit 908a29a
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 46 deletions.
diff --git a/Modules/Core/Common/include/itkNumericTraitsCovariantVectorPixel.h b/Modules/Core/Common/include/itkNumericTraitsCovariantVectorPixel.h
@@ -86,43 +86,43 @@ class NumericTraits<CovariantVector<T, D>>
   static const Self
   max(const Self &)
   {
-    return Self(NumericTraits<T>::max());
+    return MakeFilled<Self>(NumericTraits<T>::max());
   }
 
   static const Self
   min(const Self &)
   {
-    return Self(NumericTraits<T>::min());
+    return MakeFilled<Self>(NumericTraits<T>::min());
   }
 
   static const Self
   max()
   {
-    return Self(NumericTraits<T>::max());
+    return MakeFilled<Self>(NumericTraits<T>::max());
   }
 
   static const Self
   min()
   {
-    return Self(NumericTraits<T>::min());
+    return MakeFilled<Self>(NumericTraits<T>::min());
   }
 
   static const Self
   NonpositiveMin()
   {
-    return Self(NumericTraits<T>::NonpositiveMin());
+    return MakeFilled<Self>(NumericTraits<T>::NonpositiveMin());
   }
 
   static const Self
   ZeroValue()
   {
-    return Self(NumericTraits<T>::ZeroValue());
+    return MakeFilled<Self>(NumericTraits<T>::ZeroValue());
   }
 
   static const Self
   OneValue()
   {
-    return Self(NumericTraits<T>::OneValue());
+    return MakeFilled<Self>(NumericTraits<T>::OneValue());
   }
 
   static const Self

diff --git a/Modules/Core/Common/include/itkNumericTraitsDiffusionTensor3DPixel.h b/Modules/Core/Common/include/itkNumericTraitsDiffusionTensor3DPixel.h
@@ -87,61 +87,61 @@ class NumericTraits<DiffusionTensor3D<T>>
   static const Self
   max(const Self &)
   {
-    return Self(NumericTraits<T>::max());
+    return MakeFilled<Self>(NumericTraits<T>::max());
   }
 
   static const Self
   min(const Self &)
   {
-    return Self(NumericTraits<T>::min());
+    return MakeFilled<Self>(NumericTraits<T>::min());
   }
 
   static const Self
-  NonpositiveMin(const Self &)
+  max()
   {
-    return Self(NumericTraits<T>::NonpositiveMin());
+    return MakeFilled<Self>(NumericTraits<T>::max());
   }
 
   static const Self
-  ZeroValue(const Self &)
+  min()
   {
-    return Self(NumericTraits<T>::ZeroValue());
+    return MakeFilled<Self>(NumericTraits<T>::min());
   }
 
   static const Self
-  OneValue(const Self &)
+  NonpositiveMin()
   {
-    return Self(NumericTraits<T>::OneValue());
+    return MakeFilled<Self>(NumericTraits<T>::NonpositiveMin());
   }
 
   static const Self
-  max()
+  ZeroValue()
   {
-    return Self(NumericTraits<T>::max());
+    return MakeFilled<Self>(NumericTraits<T>::ZeroValue());
   }
 
   static const Self
-  min()
+  OneValue()
   {
-    return Self(NumericTraits<T>::min());
+    return MakeFilled<Self>(NumericTraits<T>::OneValue());
   }
 
   static const Self
-  NonpositiveMin()
+  NonpositiveMin(const Self &)
   {
-    return Self(NumericTraits<T>::NonpositiveMin());
+    return NonpositiveMin();
   }
 
   static const Self
-  ZeroValue()
+  ZeroValue(const Self &)
   {
-    return Self(NumericTraits<T>::ZeroValue());
+    return ZeroValue();
   }
 
   static const Self
-  OneValue()
+  OneValue(const Self &)
   {
-    return Self(NumericTraits<T>::OneValue());
+    return OneValue();
   }
 
   static constexpr bool IsSigned = std::is_signed<ValueType>::value;

diff --git a/Modules/Core/Common/include/itkNumericTraitsFixedArrayPixel.h b/Modules/Core/Common/include/itkNumericTraitsFixedArrayPixel.h
@@ -86,43 +86,43 @@ class NumericTraits<FixedArray<T, D>>
   static const Self
   max(const Self &)
   {
-    return Self(NumericTraits<T>::max());
+    return MakeFilled<Self>(NumericTraits<T>::max());
   }
 
   static const Self
   min(const Self &)
   {
-    return Self(NumericTraits<T>::min());
+    return MakeFilled<Self>(NumericTraits<T>::min());
   }
 
   static const Self
   max()
   {
-    return Self(NumericTraits<T>::max());
+    return MakeFilled<Self>(NumericTraits<T>::max());
   }
 
   static const Self
   min()
   {
-    return Self(NumericTraits<T>::min());
+    return MakeFilled<Self>(NumericTraits<T>::min());
   }
 
   static const Self
   NonpositiveMin()
   {
-    return Self(NumericTraits<T>::NonpositiveMin());
+    return MakeFilled<Self>(NumericTraits<T>::NonpositiveMin());
   }
 
   static const Self
   ZeroValue()
   {
-    return Self(NumericTraits<T>::ZeroValue());
+    return MakeFilled<Self>(NumericTraits<T>::ZeroValue());
   }
 
   static const Self
   OneValue()
   {
-    return Self(NumericTraits<T>::OneValue());
+    return MakeFilled<Self>(NumericTraits<T>::OneValue());
   }
 
   static const Self

diff --git a/Modules/Core/Common/include/itkNumericTraitsTensorPixel.h b/Modules/Core/Common/include/itkNumericTraitsTensorPixel.h
@@ -86,43 +86,43 @@ class NumericTraits<SymmetricSecondRankTensor<T, D>>
   static const Self
   max(const Self &)
   {
-    return Self(NumericTraits<T>::max());
+    return MakeFilled<Self>(NumericTraits<T>::max());
   }
 
   static const Self
   min(const Self &)
   {
-    return Self(NumericTraits<T>::min());
+    return MakeFilled<Self>(NumericTraits<T>::min());
   }
 
   static const Self
   max()
   {
-    return Self(NumericTraits<T>::max());
+    return MakeFilled<Self>(NumericTraits<T>::max());
   }
 
   static const Self
   min()
   {
-    return Self(NumericTraits<T>::min());
+    return MakeFilled<Self>(NumericTraits<T>::min());
   }
 
   static const Self
   NonpositiveMin()
   {
-    return Self(NumericTraits<T>::NonpositiveMin());
+    return MakeFilled<Self>(NumericTraits<T>::NonpositiveMin());
   }
 
   static const Self
   ZeroValue()
   {
-    return Self(NumericTraits<T>::ZeroValue());
+    return MakeFilled<Self>(NumericTraits<T>::ZeroValue());
   }
 
   static const Self
   OneValue()
   {
-    return Self(NumericTraits<T>::OneValue());
+    return MakeFilled<Self>(NumericTraits<T>::OneValue());
   }
 
   static const Self

diff --git a/Modules/Core/Common/src/itkNumericTraitsDiffusionTensor3DPixel.cxx b/Modules/Core/Common/src/itkNumericTraitsDiffusionTensor3DPixel.cxx
@@ -26,13 +26,12 @@ namespace itk
 // NumericTraits<>.
 //
 
-#define DIFFUSIONTENSOR3DPIXELSTATICTRAITSMACRO(T)                                        \
-  template <>                                                                             \
-  ITKCommon_EXPORT const DiffusionTensor3D<T> NumericTraits<DiffusionTensor3D<T>>::Zero = \
-    DiffusionTensor3D<T>(NumericTraits<T>::Zero);                                         \
-  template <>                                                                             \
-  ITKCommon_EXPORT const DiffusionTensor3D<T> NumericTraits<DiffusionTensor3D<T>>::One =  \
-    DiffusionTensor3D<T>(NumericTraits<T>::One);
+#define DIFFUSIONTENSOR3DPIXELSTATICTRAITSMACRO(T)                                         \
+  template <>                                                                              \
+  ITKCommon_EXPORT const DiffusionTensor3D<T> NumericTraits<DiffusionTensor3D<T>>::Zero{}; \
+  template <>                                                                              \
+  ITKCommon_EXPORT const DiffusionTensor3D<T> NumericTraits<DiffusionTensor3D<T>>::One =   \
+    MakeFilled<DiffusionTensor3D<T>>(1);
 
 //
 // List here the specializations of the Traits: