STYLE: Replace T var; var = x with T var = x

- Following ITK pull request InsightSoftwareConsortium/ITK#4973
SuperElastix · Nov 22, 2024 · 5fe285e · 5fe285e
1 parent f67d1f8
commit 5fe285e
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 46 deletions.
diff --git a/Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.hxx b/Common/OpenCL/ITKimprovements/itkGPUInPlaceImageFilter.hxx
@@ -78,9 +78,7 @@ GPUInPlaceImageFilter<TInputImage, TOutputImage, TParentImageFilter>::AllocateOu
       {
         // if we cannot cast the input to an output type, then allocate
         // an output usual.
-        OutputImagePointer outputPtr;
-
-        outputPtr = this->GetOutput(0);
+        OutputImagePointer outputPtr = this->GetOutput(0);
         outputPtr->SetBufferedRegion(outputPtr->GetRequestedRegion());
         outputPtr->Allocate();
       }

diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLContext.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLContext.cxx
@@ -352,8 +352,7 @@ OpenCLContext::Create(const OpenCLContext::CreateMethod method)
   }
   else if (method == OpenCLContext::MultipleMaximumFlopsDevices)
   {
-    std::list<OpenCLDevice> devices;
-    devices = OpenCLDevice::GetMaximumFlopsDevices(OpenCLDevice::GPU);
+    std::list<OpenCLDevice> devices = OpenCLDevice::GetMaximumFlopsDevices(OpenCLDevice::GPU);
     if (!devices.empty())
     {
       this->CreateContext(devices, d);

diff --git a/Common/OpenCL/ITKimprovements/itkOpenCLEvent.cxx b/Common/OpenCL/ITKimprovements/itkOpenCLEvent.cxx
@@ -77,8 +77,7 @@ OpenCLEvent::GetStatus() const
     return CL_INVALID_EVENT;
   }
 
-  cl_int st, error;
-  error = clGetEventInfo(m_Id, CL_EVENT_COMMAND_EXECUTION_STATUS, sizeof(st), &st, 0);
+  cl_int st, error = clGetEventInfo(m_Id, CL_EVENT_COMMAND_EXECUTION_STATUS, sizeof(st), &st, 0);
   if (error != CL_SUCCESS)
   {
     return error;

diff --git a/Common/itkMultiOrderBSplineDecompositionImageFilter.hxx b/Common/itkMultiOrderBSplineDecompositionImageFilter.hxx
@@ -403,8 +403,7 @@ MultiOrderBSplineDecompositionImageFilter<TInputImage, TOutputImage>::EnlargeOut
 
   // this filter requires the all of the output image to be in
   // the buffer
-  TOutputImage * imgData;
-  imgData = dynamic_cast<TOutputImage *>(output);
+  TOutputImage * imgData = dynamic_cast<TOutputImage *>(output);
   if (imgData)
   {
     imgData->SetRequestedRegionToLargestPossibleRegion();

diff --git a/Components/Metrics/GradientDifference/itkGradientDifferenceImageToImageMetric2.hxx b/Components/Metrics/GradientDifference/itkGradientDifferenceImageToImageMetric2.hxx
@@ -453,8 +453,7 @@ void
 GradientDifferenceImageToImageMetric<TFixedImage, TMovingImage>::GetDerivative(const ParametersType & parameters,
                                                                                DerivativeType &       derivative) const
 {
-  ParametersType testPoint;
-  testPoint = parameters;
+  ParametersType     testPoint = parameters;
   const unsigned int numberOfParameters = this->GetNumberOfParameters();
   derivative.set_size(numberOfParameters);
 

diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/itkANNFixedRadiusTreeSearch.hxx b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/itkANNFixedRadiusTreeSearch.hxx
@@ -52,11 +52,9 @@ ANNFixedRadiusTreeSearch<TBinaryTree>::Search(const MeasurementVectorType & qp,
   double sqRad = this->m_SquaredRadius;
 
   /** Allocate memory for ANN indices and distances arrays. */
-  ANNIndexArrayType ANNIndices;
-  ANNIndices = new ANNIndexType[k];
+  ANNIndexArrayType ANNIndices = new ANNIndexType[k];
 
-  ANNDistanceArrayType ANNDistances;
-  ANNDistances = new ANNDistanceType[k];
+  ANNDistanceArrayType ANNDistances = new ANNDistanceType[k];
 
   /** Alocate memory for ANN query point and copy qp to it. */
   ANNPointType ANNQueryPoint = annAllocPt(dim);
@@ -101,11 +99,9 @@ ANNFixedRadiusTreeSearch<TBinaryTree>::Search(const MeasurementVectorType & qp,
   double eps = this->m_ErrorBound;
 
   /** Allocate memory for ANN indices and distances arrays. */
-  ANNIndexArrayType ANNIndices;
-  ANNIndices = new ANNIndexType[k];
+  ANNIndexArrayType ANNIndices = new ANNIndexType[k];
 
-  ANNDistanceArrayType ANNDistances;
-  ANNDistances = new ANNDistanceType[k];
+  ANNDistanceArrayType ANNDistances = new ANNDistanceType[k];
 
   /** Alocate memory for ANN query point and copy qp to it. */
   ANNPointType ANNQueryPoint = annAllocPt(dim);

diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/itkANNPriorityTreeSearch.hxx b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/itkANNPriorityTreeSearch.hxx
@@ -96,11 +96,9 @@ ANNPriorityTreeSearch<TBinaryTree>::Search(const MeasurementVectorType & qp,
   double eps = this->m_ErrorBound;
 
   /** Allocate memory for ANN indices and distances arrays. */
-  ANNIndexArrayType ANNIndices;
-  ANNIndices = new ANNIndexType[k];
+  ANNIndexArrayType ANNIndices = new ANNIndexType[k];
 
-  ANNDistanceArrayType ANNDistances;
-  ANNDistances = new ANNDistanceType[k];
+  ANNDistanceArrayType ANNDistances = new ANNDistanceType[k];
 
   /** Alocate memory for ANN query point and copy qp to it. */
   ANNPointType ANNQueryPoint = annAllocPt(dim);

diff --git a/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/itkANNStandardTreeSearch.hxx b/Components/Metrics/KNNGraphAlphaMutualInformation/KNN/itkANNStandardTreeSearch.hxx
@@ -50,11 +50,9 @@ ANNStandardTreeSearch<TBinaryTree>::Search(const MeasurementVectorType & qp,
   double eps = this->m_ErrorBound;
 
   /** Allocate memory for ANN indices and distances arrays. */
-  ANNIndexArrayType ANNIndices;
-  ANNIndices = new ANNIndexType[k];
+  ANNIndexArrayType ANNIndices = new ANNIndexType[k];
 
-  ANNDistanceArrayType ANNDistances;
-  ANNDistances = new ANNDistanceType[k];
+  ANNDistanceArrayType ANNDistances = new ANNDistanceType[k];
 
   /** Alocate memory for ANN query point and copy qp to it. */
   ANNPointType ANNQueryPoint = annAllocPt(dim);

diff --git a/...rics/NormalizedGradientCorrelation/itkNormalizedGradientCorrelationImageToImageMetric.hxx b/...rics/NormalizedGradientCorrelation/itkNormalizedGradientCorrelationImageToImageMetric.hxx
@@ -417,8 +417,7 @@ NormalizedGradientCorrelationImageToImageMetric<TFixedImage, TMovingImage>::GetD
   const ParametersType & parameters,
   DerivativeType &       derivative) const
 {
-  ParametersType testPoint;
-  testPoint = parameters;
+  ParametersType     testPoint = parameters;
   const unsigned int numberOfParameters = this->GetNumberOfParameters();
   derivative.set_size(numberOfParameters);
 

diff --git a/Components/Metrics/PCAMetric2/itkPCAMetric2.hxx b/Components/Metrics/PCAMetric2/itkPCAMetric2.hxx
@@ -470,8 +470,7 @@ PCAMetric2<TFixedImage, TMovingImage>::GetValueAndDerivative(const ParametersTyp
   /** Sub components of metric derivative */
   vnl_diag_matrix<DerivativeValueType> dSdmu_part1(lastDimSize);
 
-  unsigned int startSamplesOK;
-  startSamplesOK = 0;
+  unsigned int startSamplesOK = 0;
 
   for (unsigned int d = 0; d < lastDimSize; ++d)
   {

diff --git a/Components/Metrics/PatternIntensity/itkPatternIntensityImageToImageMetric.hxx b/Components/Metrics/PatternIntensity/itkPatternIntensityImageToImageMetric.hxx
@@ -369,8 +369,7 @@ void
 PatternIntensityImageToImageMetric<TFixedImage, TMovingImage>::GetDerivative(const ParametersType & parameters,
                                                                              DerivativeType &       derivative) const
 {
-  ParametersType testPoint;
-  testPoint = parameters;
+  ParametersType     testPoint = parameters;
   const unsigned int numberOfParameters = this->GetNumberOfParameters();
   derivative.set_size(numberOfParameters);
 

diff --git a/Components/Optimizers/SimultaneousPerturbation/elxSimultaneousPerturbation.hxx b/Components/Optimizers/SimultaneousPerturbation/elxSimultaneousPerturbation.hxx
@@ -202,9 +202,7 @@ void
 SimultaneousPerturbation<TElastix>::AfterRegistration()
 {
   /** Print the best metric value */
-  double bestValue;
-
-  bestValue = this->GetValue();
+  double bestValue = this->GetValue();
   log::info(std::ostringstream{} << '\n' << "Final metric value  = " << bestValue);
 
 } // end AfterRegistration

diff --git a/...s/Transforms/BSplineDeformableTransformWithDiffusion/elxBSplineTransformWithDiffusion.hxx b/...s/Transforms/BSplineDeformableTransformWithDiffusion/elxBSplineTransformWithDiffusion.hxx
@@ -610,8 +610,8 @@ BSplineTransformWithDiffusion<TElastix>::SetInitialGrid(bool upsampleGridOption)
   OriginType  gridorigin;
 
   /** Get the fixed image. */
-  typename FixedImageType::Pointer fixedimage;
-  fixedimage = const_cast<FixedImageType *>(this->m_Registration->GetAsITKBaseType()->GetFixedImage());
+  typename FixedImageType::Pointer fixedimage =
+    const_cast<FixedImageType *>(this->m_Registration->GetAsITKBaseType()->GetFixedImage());
 
   /** Get the size etc. of this image. */
 
@@ -693,8 +693,8 @@ BSplineTransformWithDiffusion<TElastix>::IncreaseScale()
   // OriginType gridoriginLow = this->m_BSplineTransform->GetGridOrigin();
 
   /** Get the fixed image. */
-  typename FixedImageType::Pointer fixedimage;
-  fixedimage = const_cast<FixedImageType *>(this->m_Registration->GetAsITKBaseType()->GetFixedImage());
+  typename FixedImageType::Pointer fixedimage =
+    const_cast<FixedImageType *>(this->m_Registration->GetAsITKBaseType()->GetFixedImage());
 
   /** Set start values for computing the new grid size. */
   RegionType  gridregionHigh = fixedimage->GetLargestPossibleRegion();

diff --git a/.../Transforms/BSplineDeformableTransformWithDiffusion/itkVectorMeanDiffusionImageFilter.hxx b/.../Transforms/BSplineDeformableTransformWithDiffusion/itkVectorMeanDiffusionImageFilter.hxx
@@ -69,8 +69,7 @@ VectorMeanDiffusionImageFilter<TInputImage, TGrayValueImage>::GenerateInputReque
 
   // get a copy of the input requested region (should equal the output
   // requested region)
-  typename TInputImage::RegionType inputRequestedRegion;
-  inputRequestedRegion = inputPtr->GetRequestedRegion();
+  typename TInputImage::RegionType inputRequestedRegion = inputPtr->GetRequestedRegion();
 
   // pad the input requested region by the operator radius
   inputRequestedRegion.PadByRadius(this->m_Radius);

diff --git a/Testing/elxImageCompare.cxx b/Testing/elxImageCompare.cxx
@@ -118,10 +118,8 @@ main(int argc, char ** argv)
   }
 
   // The sizes of the baseline and test image must match
-  ImageType::SizeType baselineSize;
-  baselineSize = baselineReader->GetOutput()->GetLargestPossibleRegion().GetSize();
-  ImageType::SizeType testSize;
-  testSize = testReader->GetOutput()->GetLargestPossibleRegion().GetSize();
+  ImageType::SizeType baselineSize = baselineReader->GetOutput()->GetLargestPossibleRegion().GetSize();
+  ImageType::SizeType testSize = testReader->GetOutput()->GetLargestPossibleRegion().GetSize();
 
   if (baselineSize != testSize)
   {