COMP: Remove inclusion of .hxx files as headers

The ability to include either .h or .hxx files as header files required recursively reading the .h files twice. The added complexity is unnecessary, costly, and can confuse static analysis tools that monitor header guardes (due to reaching the maximum depth of recursion limits for nested #ifdefs in checking).
InsightSoftwareConsortium · Dec 18, 2021 · 817e97c · 817e97c
1 parent e6935aa
commit 817e97c
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 18 deletions.
diff --git a/include/itkDescoteauxEigenToMeasureImageFilter.hxx b/include/itkDescoteauxEigenToMeasureImageFilter.hxx
@@ -19,7 +19,6 @@
 #ifndef itkDescoteauxEigenToMeasureImageFilter_hxx
 #define itkDescoteauxEigenToMeasureImageFilter_hxx
 
-#include "itkDescoteauxEigenToMeasureImageFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
 
@@ -56,9 +55,9 @@ DescoteauxEigenToMeasureImageFilter<TInputImage, TOutputImage>::ProcessPixel(con
   auto   a1 = static_cast<double>(pixel[0]);
   auto   a2 = static_cast<double>(pixel[1]);
   auto   a3 = static_cast<double>(pixel[2]);
-  double l1 = Math::abs(a1);
-  double l2 = Math::abs(a2);
-  double l3 = Math::abs(a3);
+  double l1 = itk::Math::abs(a1);
+  double l2 = itk::Math::abs(a2);
+  double l3 = itk::Math::abs(a3);
 
   /* Deal with l3 > 0 */
   if (m_EnhanceType * a3 < 0)
@@ -74,7 +73,7 @@ DescoteauxEigenToMeasureImageFilter<TInputImage, TOutputImage>::ProcessPixel(con
 
   /* Compute measures */
   const double Rsheet = l2 / l3;
-  const double Rblob = Math::abs(2 * l3 - l2 - l1) / l3;
+  const double Rblob = itk::Math::abs(2 * l3 - l2 - l1) / l3;
   const double Rnoise = sqrt(l1 * l1 + l2 * l2 + l3 * l3);
 
   /* Multiply together to get sheetness */

diff --git a/include/itkDescoteauxEigenToMeasureParameterEstimationFilter.hxx b/include/itkDescoteauxEigenToMeasureParameterEstimationFilter.hxx
@@ -19,7 +19,6 @@
 #ifndef itkDescoteauxEigenToMeasureParameterEstimationFilter_hxx
 #define itkDescoteauxEigenToMeasureParameterEstimationFilter_hxx
 
-#include "itkDescoteauxEigenToMeasureParameterEstimationFilter.h"
 
 namespace itk
 {

diff --git a/include/itkEigenToMeasureImageFilter.hxx b/include/itkEigenToMeasureImageFilter.hxx
@@ -19,7 +19,6 @@
 #ifndef itkEigenToMeasureImageFilter_hxx
 #define itkEigenToMeasureImageFilter_hxx
 
-#include "itkEigenToMeasureImageFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
 

diff --git a/include/itkEigenToMeasureParameterEstimationFilter.hxx b/include/itkEigenToMeasureParameterEstimationFilter.hxx
@@ -19,7 +19,6 @@
 #ifndef itkEigenToMeasureParameterEstimationFilter_hxx
 #define itkEigenToMeasureParameterEstimationFilter_hxx
 
-#include "itkEigenToMeasureParameterEstimationFilter.h"
 #include "itkCommand.h"
 #include "itkImageAlgorithm.h"
 #include "itkImageRegionSplitterSlowDimension.h"

diff --git a/include/itkHessianGaussianImageFilter.hxx b/include/itkHessianGaussianImageFilter.hxx
@@ -19,7 +19,6 @@
 #ifndef itkHessianGaussianImageFilter_hxx
 #define itkHessianGaussianImageFilter_hxx
 
-#include "itkHessianGaussianImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkProgressAccumulator.h"
 #include "itkGaussianDerivativeOperator.h"

diff --git a/include/itkKrcahEigenToMeasureImageFilter.hxx b/include/itkKrcahEigenToMeasureImageFilter.hxx
@@ -19,7 +19,6 @@
 #ifndef itkKrcahEigenToMeasureImageFilter_hxx
 #define itkKrcahEigenToMeasureImageFilter_hxx
 
-#include "itkKrcahEigenToMeasureImageFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
 
@@ -57,9 +56,9 @@ KrcahEigenToMeasureImageFilter<TInputImage, TOutputImage>::ProcessPixel(const In
   auto   a1 = static_cast<double>(pixel[0]);
   auto   a2 = static_cast<double>(pixel[1]);
   auto   a3 = static_cast<double>(pixel[2]);
-  double l1 = Math::abs(a1);
-  double l2 = Math::abs(a2);
-  double l3 = Math::abs(a3);
+  double l1 = itk::Math::abs(a1);
+  double l2 = itk::Math::abs(a2);
+  double l3 = itk::Math::abs(a3);
 
   /* Avoid divisions by zero (or close to zero) */
   if (static_cast<double>(l3) < Math::eps || static_cast<double>(l2) < Math::eps)

diff --git a/include/itkKrcahEigenToMeasureParameterEstimationFilter.hxx b/include/itkKrcahEigenToMeasureParameterEstimationFilter.hxx
@@ -19,7 +19,6 @@
 #ifndef itkKrcahEigenToMeasureParameterEstimationFilter_hxx
 #define itkKrcahEigenToMeasureParameterEstimationFilter_hxx
 
-#include "itkKrcahEigenToMeasureParameterEstimationFilter.h"
 
 namespace itk
 {
@@ -182,7 +181,7 @@ KrcahEigenToMeasureParameterEstimationFilter<TInputImage, TOutputImage>::Calcula
   RealType trace = 0;
   for (unsigned int i = 0; i < pixel.Length; ++i)
   {
-    trace += Math::abs(pixel[i]);
+    trace += itk::Math::abs(pixel[i]);
   }
   return trace;
 }

diff --git a/include/itkKrcahPreprocessingImageToImageFilter.hxx b/include/itkKrcahPreprocessingImageToImageFilter.hxx
@@ -19,7 +19,6 @@
 #ifndef itkKrcahPreprocessingImageToImageFilter_hxx
 #define itkKrcahPreprocessingImageToImageFilter_hxx
 
-#include "itkKrcahPreprocessingImageToImageFilter.h"
 #include "itkGaussianOperator.h"
 #include "itkMath.h"
 

diff --git a/include/itkMaximumAbsoluteValueImageFilter.h b/include/itkMaximumAbsoluteValueImageFilter.h
@@ -62,7 +62,7 @@ class MaximumAbsoluteValue
   inline TOutputPixel
   operator()(const TInputPixel1 A, const TInputPixel2 B)
   {
-    return static_cast<TOutputPixel>(Math::abs(A) > Math::abs(B) ? A : B);
+    return static_cast<TOutputPixel>(itk::Math::abs(A) > itk::Math::abs(B) ? A : B);
   }
 }; // end of class
 } // namespace Functor

diff --git a/include/itkMultiScaleHessianEnhancementImageFilter.hxx b/include/itkMultiScaleHessianEnhancementImageFilter.hxx
@@ -18,7 +18,6 @@
 #ifndef itkMultiScaleHessianEnhancementImageFilter_hxx
 #define itkMultiScaleHessianEnhancementImageFilter_hxx
 
-#include "itkMultiScaleHessianEnhancementImageFilter.h"
 #include "itkMath.h"
 #include "itkProgressAccumulator.h"