STYLE: Do not use itkGetStaticConstMacro in ITK/Modules/Filtering

Follow-up to commit d72d28f "STYLE: Do not use itkGetStaticConstMacro in ITK", by Hans Johnson, 4 March 2018.
InsightSoftwareConsortium · Sep 26, 2021 · 4408bd4 · 4408bd4
1 parent 9def6b7
commit 4408bd4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/Modules/Filtering/ImageFilterBase/include/itkBinaryGeneratorImageFilter.h b/Modules/Filtering/ImageFilterBase/include/itkBinaryGeneratorImageFilter.h
@@ -218,11 +218,9 @@ class ITK_TEMPLATE_EXPORT BinaryGeneratorImageFilter : public InPlaceImageFilter
 #ifdef ITK_USE_CONCEPT_CHECKING
   // Begin concept checking
   itkConceptMacro(SameDimensionCheck1,
-                  (Concept::SameDimension<itkGetStaticConstMacro(InputImage1Dimension),
-                                          itkGetStaticConstMacro(InputImage2Dimension)>));
+                  (Concept::SameDimension<Self::InputImage1Dimension, Self::InputImage2Dimension>));
   itkConceptMacro(SameDimensionCheck2,
-                  (Concept::SameDimension<itkGetStaticConstMacro(InputImage1Dimension),
-                                          itkGetStaticConstMacro(OutputImageDimension)>));
+                  (Concept::SameDimension<Self::InputImage1Dimension, Self::OutputImageDimension>));
   // End concept checking
 #endif
 

diff --git a/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx b/Modules/Filtering/ImageGrid/test/itkResampleImageTest8.cxx
@@ -43,20 +43,20 @@ class ProjectTransform : public itk::Transform<double, 3, 2>
   using typename Superclass::FixedParametersType;
 
   /** Standard vector type for this class. */
-  using InputVectorType = itk::Vector<double, itkGetStaticConstMacro(InputSpaceDimension)>;
-  using OutputVectorType = itk::Vector<double, itkGetStaticConstMacro(OutputSpaceDimension)>;
+  using InputVectorType = itk::Vector<double, Self::InputSpaceDimension>;
+  using OutputVectorType = itk::Vector<double, Self::OutputSpaceDimension>;
 
   /** Standard covariant vector type for this class. */
-  using InputCovariantVectorType = itk::CovariantVector<double, itkGetStaticConstMacro(InputSpaceDimension)>;
-  using OutputCovariantVectorType = itk::CovariantVector<double, itkGetStaticConstMacro(OutputSpaceDimension)>;
+  using InputCovariantVectorType = itk::CovariantVector<double, Self::InputSpaceDimension>;
+  using OutputCovariantVectorType = itk::CovariantVector<double, Self::OutputSpaceDimension>;
 
   /** Standard vnl_vector type for this class. */
-  using InputVnlVectorType = vnl_vector_fixed<double, itkGetStaticConstMacro(InputSpaceDimension)>;
-  using OutputVnlVectorType = vnl_vector_fixed<double, itkGetStaticConstMacro(OutputSpaceDimension)>;
+  using InputVnlVectorType = vnl_vector_fixed<double, Self::InputSpaceDimension>;
+  using OutputVnlVectorType = vnl_vector_fixed<double, Self::OutputSpaceDimension>;
 
   /** Standard coordinate point type for this class. */
-  using InputPointType = itk::Point<double, itkGetStaticConstMacro(InputSpaceDimension)>;
-  using OutputPointType = itk::Point<double, itkGetStaticConstMacro(OutputSpaceDimension)>;
+  using InputPointType = itk::Point<double, Self::InputSpaceDimension>;
+  using OutputPointType = itk::Point<double, Self::OutputSpaceDimension>;
 
   using Superclass::TransformCovariantVector;
   using Superclass::TransformVector;