ENH: clang-format style ambiguity

Run clang-format verison 19 followed by clang-format version 8. There are some changes that are made by 19 that are not explicitly changed by version 8. It becomes and issue with IDE's that integrate a newer version of clang-format that introduces unmandated changes in clang-format version 8.
N-Dekker · Dec 3, 2024 · fb11a10 · fb11a10
1 parent 997b69b
commit fb11a10
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 34 deletions.
diff --git a/CMake/Findcppcheck.cpp b/CMake/Findcppcheck.cpp
@@ -1,17 +1,17 @@
 /**
-* \file Findcppcheck.cpp
-* \brief Dummy C++ source file used by CMake module Findcppcheck.cmake
-*
-* \author
-* Ryan Pavlik, 2009-2010
-* <[email protected]>
-* http://academic.cleardefinition.com/
-*
-*/
+ * \file Findcppcheck.cpp
+ * \brief Dummy C++ source file used by CMake module Findcppcheck.cmake
+ *
+ * \author
+ * Ryan Pavlik, 2009-2010
+ * <[email protected]>
+ * http://academic.cleardefinition.com/
+ *
+ */
 
 
-
-int main(int argc, char* argv[])
+int
+main(int argc, char * argv[])
 {
   return 0;
 }
diff --git a/Examples/Filtering/DigitallyReconstructedRadiograph1.cxx b/Examples/Filtering/DigitallyReconstructedRadiograph1.cxx
@@ -46,7 +46,7 @@
 #include "itkRayCastInterpolateImageFunction.h"
 // Software Guide : EndCodeSnippet
 
-//#define WRITE_CUBE_IMAGE_TO_FILE
+// #define WRITE_CUBE_IMAGE_TO_FILE
 
 
 void

diff --git a/Examples/Filtering/FFTDirectInverse2.cxx b/Examples/Filtering/FFTDirectInverse2.cxx
@@ -43,9 +43,9 @@
 #include "itkFlipImageFilter.h"
 
 #if !defined(ITK_USE_FFTWF)
-//#error "This example only works when single precision FFTW is used
-// Changing WorkPixeltype to double and changing this conditional to
-// ITK_USE_FFTWD will also work.
+// #error "This example only works when single precision FFTW is used
+//  Changing WorkPixeltype to double and changing this conditional to
+//  ITK_USE_FFTWD will also work.
 #endif
 
 int

diff --git a/Modules/Core/GPUCommon/include/itkGPUReduction.hxx b/Modules/Core/GPUCommon/include/itkGPUReduction.hxx
@@ -20,7 +20,7 @@
 
 #include "itkMacro.h"
 
-//#define CPU_VERIFY
+// #define CPU_VERIFY
 
 namespace itk
 {

diff --git a/Modules/Core/GPUCommon/src/itkGPUDataManager.cxx b/Modules/Core/GPUCommon/src/itkGPUDataManager.cxx
@@ -17,7 +17,7 @@
  *=========================================================================*/
 
 #include "itkGPUDataManager.h"
-//#define VERBOSE
+// #define VERBOSE
 
 namespace itk
 {

diff --git a/Modules/Core/GPUCommon/test/itkGPUImageTest.cxx b/Modules/Core/GPUCommon/test/itkGPUImageTest.cxx
@@ -20,7 +20,7 @@
  * Test program for itkGPUImage class.
  * This program shows how to use GPU image and GPU program.
  */
-//#include "pathToOpenCLSourceCode.h"
+// #include "pathToOpenCLSourceCode.h"
 #include "itkGPUImage.h"
 #include "itkGPUKernelManager.h"
 #include "itkGPUContextManager.h"

diff --git a/Modules/Core/GPUCommon/test/itkGPUReductionTest.cxx b/Modules/Core/GPUCommon/test/itkGPUReductionTest.cxx
@@ -20,7 +20,7 @@
  * Test program for itkGPUImage class.
  * This program shows how to use GPU image and GPU program.
  */
-//#include "pathToOpenCLSourceCode.h"
+// #include "pathToOpenCLSourceCode.h"
 #include "itkGPUImage.h"
 #include "itkGPUReduction.h"
 

diff --git a/Modules/Core/ImageFunction/test/itkLabelImageGaussianInterpolateImageFunctionTest.cxx b/Modules/Core/ImageFunction/test/itkLabelImageGaussianInterpolateImageFunctionTest.cxx
@@ -103,9 +103,9 @@ itkLabelImageGaussianInterpolateImageFunctionTest(int, char *[])
     std::cerr << "Parameters were not returned correctly." << std::endl;
   }
 
-  //########################
-  // Now check the results
-  // The ImageSizeToCompute
+  // ########################
+  //  Now check the results
+  //  The ImageSizeToCompute
   constexpr unsigned char       default_background_value = 17;
   const itk::IndexValueType     large_xSize = 5 + 1;
   constexpr itk::IndexValueType large_ySize = 5;

diff --git a/Modules/Core/TestKernel/include/itkTestDriverInclude.h b/Modules/Core/TestKernel/include/itkTestDriverInclude.h
@@ -160,6 +160,6 @@ extern std::map<std::string, int>
 RegressionTestBaselines(char * baselineFilename);
 
 // Needed for explicit instantiate
-//#include "itkTestingComparisonImageFilter.hxx"
+// #include "itkTestingComparisonImageFilter.hxx"
 
 #endif
diff --git a/Modules/Filtering/DistanceMap/include/itkSignedDanielssonDistanceMapImageFilter.h b/Modules/Filtering/DistanceMap/include/itkSignedDanielssonDistanceMapImageFilter.h
@@ -41,7 +41,7 @@ class ITK_TEMPLATE_EXPORT InvertIntensityFunctor
     {
       return NumericTraits<InputPixelType>::OneValue();
     }
-  }
+  } // namespace itk
 };
 } // namespace Functor
 } // namespace itk

diff --git a/Modules/Filtering/GPUThresholding/test/itkGPUImageFilterTest.cxx b/Modules/Filtering/GPUThresholding/test/itkGPUImageFilterTest.cxx
@@ -22,7 +22,7 @@
  * This program creates a GPU Mean filter and a CPU threshold filter using
  * object factory framework and test pipelining of GPU and CPU filters.
  */
-//#include "pathToOpenCLSourceCode.h"
+// #include "pathToOpenCLSourceCode.h"
 
 #include "itkImageFileReader.h"
 #include "itkImageFileWriter.h"

diff --git a/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkOrientImageFilter.hxx
@@ -234,7 +234,7 @@ OrientImageFilter<TInputImage, TOutputImage>::NeedToFlip()
   return false;
 }
 
-//#define DefinedDebugOrient
+// #define DefinedDebugOrient
 #if defined(DefinedDebugOrient)
 #  define DEBUG_EXECUTE(X) X
 

diff --git a/Modules/Filtering/MathematicalMorphology/include/itkAnchorOpenCloseLine.h b/Modules/Filtering/MathematicalMorphology/include/itkAnchorOpenCloseLine.h
@@ -21,7 +21,7 @@
 #include "itkMorphologyHistogram.h"
 #include "itkIndent.h"
 
-//#define RAWHIST
+// #define RAWHIST
 
 namespace itk
 {

diff --git a/Modules/Filtering/MathematicalMorphology/include/itkReconstructionImageFilter.h b/Modules/Filtering/MathematicalMorphology/include/itkReconstructionImageFilter.h
@@ -24,7 +24,7 @@
 #include "itkProgressReporter.h"
 #include <queue>
 
-//#define BASIC
+// #define BASIC
 #define COPY
 
 #ifdef COPY

diff --git a/Modules/Filtering/Thresholding/include/itkLiThresholdCalculator.hxx b/Modules/Filtering/Thresholding/include/itkLiThresholdCalculator.hxx
@@ -121,7 +121,7 @@ LiThresholdCalculator<THistogram, TOutput>::GenerateData()
     // return ( int ) ( IS_NEG ( x ) ? x - .5 : x + .5 );
     //}
     //
-    //#define IS_NEG( x ) ( ( x ) < -DBL_EPSILON )
+    // #define IS_NEG( x ) ( ( x ) < -DBL_EPSILON )
     //
 
     // Shift the mean by the minimum to have the range start at zero,

diff --git a/Modules/Nonunit/IntegratedTest/test/itkShrinkImagePreserveObjectPhysicalLocations.cxx b/Modules/Nonunit/IntegratedTest/test/itkShrinkImagePreserveObjectPhysicalLocations.cxx
@@ -210,7 +210,7 @@ itkShrinkImagePreserveObjectPhysicalLocations(int, char *[])
   smootherShrinkfilter->Update();
   TImageType::Pointer GaussianShrinkSmallImage = smootherShrinkfilter->GetOutput();
 
-//#define WriteDebugImaging
+// #define WriteDebugImaging
 #ifdef WriteDebugImaging
   using WriterType = itk::ImageFileWriter<WImageType>;
   auto                                                  writer = WriterType::New();

diff --git a/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.hxx b/Modules/Nonunit/Review/include/itkLabelGeometryImageFilter.hxx
@@ -37,7 +37,8 @@ namespace
 // Private Helper functions
 //
 template <unsigned int VDimension>
-vnl_matrix<double> inline CalculateRotationMatrix(const vnl_symmetric_eigensystem<double> & eig)
+inline vnl_matrix<double>
+CalculateRotationMatrix(const vnl_symmetric_eigensystem<double> & eig)
 {
   vnl_matrix<double> rotationMatrix(VDimension, VDimension, 0);
   for (unsigned int i = 0; i < VDimension; ++i)

diff --git a/Modules/Registration/Metricsv4/include/itkDefaultImageToImageMetricTraitsv4.h b/Modules/Registration/Metricsv4/include/itkDefaultImageToImageMetricTraitsv4.h
@@ -116,8 +116,8 @@ class DefaultImageToImageMetricTraitsv4
 };
 } // end namespace itk
 
-//#ifndef ITK_MANUAL_INSTANTIATION
-//#include "itkDefaultImageToImageMetricTraitsv4.hxx"
-//#endif
+// #ifndef ITK_MANUAL_INSTANTIATION
+// #include "itkDefaultImageToImageMetricTraitsv4.hxx"
+// #endif
 
 #endif