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

Using Notepad++, Replace in Files, doing: Find what: ^( [ ]+)([^ ][^=\r\n]*)([ ]+)(\w+);[\r\n]+\1\4\ = Replace with: $1$2$3$4 = Filters: itk*.* !+\test Directory: D:\src\ITK\Modules [v] Match case (*) Regular expression Excluded a few cases where the syntax `T var; var = x` appears intentional (in ConceptChecking, ImageKmeansModelEstimator, MahalanobisDistanceThresholdImageFunction, QuasiNewtonOptimizerv4Template, and VariableSizeMatrix). - Following pull request InsightSoftwareConsortium#4970 commit 89b5bd0 "STYLE: Replace `Iterator it; it = x` with `Iterator it = x`" and other similar commits for different types of variables.
N-Dekker · Nov 21, 2024 · 5e01fd8 · 5e01fd8
1 parent c35278c
commit 5e01fd8
Show file tree

Hide file tree

Showing 52 changed files with 79 additions and 170 deletions.
diff --git a/Modules/Core/Common/include/itkAnnulusOperator.hxx b/Modules/Core/Common/include/itkAnnulusOperator.hxx
@@ -30,9 +30,7 @@ template <typename TPixel, unsigned int TDimension, typename TAllocator>
 void
 AnnulusOperator<TPixel, TDimension, TAllocator>::CreateOperator()
 {
-  CoefficientVector coefficients;
-
-  coefficients = this->GenerateCoefficients();
+  CoefficientVector coefficients = this->GenerateCoefficients();
 
   this->Fill(coefficients);
 }

diff --git a/Modules/Core/Common/include/itkConstNeighborhoodIteratorWithOnlyIndex.h b/Modules/Core/Common/include/itkConstNeighborhoodIteratorWithOnlyIndex.h
@@ -409,8 +409,7 @@ inline ConstNeighborhoodIteratorWithOnlyIndex<TImage>
 operator+(const ConstNeighborhoodIteratorWithOnlyIndex<TImage> &                      it,
           const typename ConstNeighborhoodIteratorWithOnlyIndex<TImage>::OffsetType & ind)
 {
-  ConstNeighborhoodIteratorWithOnlyIndex<TImage> ret;
-  ret = it;
+  ConstNeighborhoodIteratorWithOnlyIndex<TImage> ret = it;
   ret += ind;
   return ret;
 }
@@ -428,8 +427,7 @@ inline ConstNeighborhoodIteratorWithOnlyIndex<TImage>
 operator-(const ConstNeighborhoodIteratorWithOnlyIndex<TImage> &                      it,
           const typename ConstNeighborhoodIteratorWithOnlyIndex<TImage>::OffsetType & ind)
 {
-  ConstNeighborhoodIteratorWithOnlyIndex<TImage> ret;
-  ret = it;
+  ConstNeighborhoodIteratorWithOnlyIndex<TImage> ret = it;
   ret -= ind;
   return ret;
 }

diff --git a/Modules/Core/Common/include/itkLaplacianOperator.hxx b/Modules/Core/Common/include/itkLaplacianOperator.hxx
@@ -35,9 +35,7 @@ template <typename TPixel, unsigned int VDimension, typename TAllocator>
 void
 LaplacianOperator<TPixel, VDimension, TAllocator>::CreateOperator()
 {
-  CoefficientVector coefficients;
-
-  coefficients = this->GenerateCoefficients();
+  CoefficientVector coefficients = this->GenerateCoefficients();
 
   this->Fill(coefficients);
 }

diff --git a/Modules/Core/GPUCommon/include/itkGPUInPlaceImageFilter.hxx b/Modules/Core/GPUCommon/include/itkGPUInPlaceImageFilter.hxx
@@ -73,9 +73,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/Modules/Core/GPUCommon/include/itkGPUKernelManager.h b/Modules/Core/GPUCommon/include/itkGPUKernelManager.h
@@ -124,9 +124,7 @@ class GPUKernelManager : public LightObject
       return false;
     }
 
-    cl_int errid;
-
-    errid = clSetKernelArg(m_KernelContainer[kernelIdx], argIdx, sizeof(cl_mem), manager->GetGPUBufferPointer());
+    cl_int errid = clSetKernelArg(m_KernelContainer[kernelIdx], argIdx, sizeof(cl_mem), manager->GetGPUBufferPointer());
     OpenCLCheckError(errid, __FILE__, __LINE__, ITK_LOCATION);
 
     m_KernelArgumentReady[kernelIdx][argIdx].m_IsReady = true;

diff --git a/Modules/Core/GPUCommon/src/itkGPUKernelManager.cxx b/Modules/Core/GPUCommon/src/itkGPUKernelManager.cxx
@@ -317,9 +317,7 @@ GPUKernelManager::SetKernelArg(int kernelIdx, cl_uint argIdx, size_t argSize, co
     return false;
   }
 
-  cl_int errid;
-
-  errid = clSetKernelArg(m_KernelContainer[kernelIdx], argIdx, argSize, argVal);
+  cl_int errid = clSetKernelArg(m_KernelContainer[kernelIdx], argIdx, argSize, argVal);
   OpenCLCheckError(errid, __FILE__, __LINE__, ITK_LOCATION);
 
   m_KernelArgumentReady[kernelIdx][argIdx].m_IsReady = true;
@@ -413,9 +411,7 @@ GPUKernelManager::SetKernelArgWithImage(int kernelIdx, cl_uint argIdx, GPUDataMa
     return false;
   }
 
-  cl_int errid;
-
-  errid = clSetKernelArg(m_KernelContainer[kernelIdx], argIdx, sizeof(cl_mem), manager->GetGPUBufferPointer());
+  cl_int errid = clSetKernelArg(m_KernelContainer[kernelIdx], argIdx, sizeof(cl_mem), manager->GetGPUBufferPointer());
   OpenCLCheckError(errid, __FILE__, __LINE__, ITK_LOCATION);
 
   m_KernelArgumentReady[kernelIdx][argIdx].m_IsReady = true;
@@ -624,16 +620,15 @@ GPUKernelManager::LaunchKernel(int kernelIdx, int dim, size_t * globalWorkSize,
   // localWorkSize[0] = localWorkSize[1] = localWorkSize[2] = 1;
   //
 
-  cl_int errid;
-  errid = clEnqueueNDRangeKernel(m_Manager->GetCommandQueue(m_CommandQueueId),
-                                 m_KernelContainer[kernelIdx],
-                                 (cl_uint)dim,
-                                 nullptr,
-                                 globalWorkSize,
-                                 localWorkSize,
-                                 0,
-                                 nullptr,
-                                 nullptr);
+  cl_int errid = clEnqueueNDRangeKernel(m_Manager->GetCommandQueue(m_CommandQueueId),
+                                        m_KernelContainer[kernelIdx],
+                                        (cl_uint)dim,
+                                        nullptr,
+                                        globalWorkSize,
+                                        localWorkSize,
+                                        0,
+                                        nullptr,
+                                        nullptr);
   OpenCLCheckError(errid, __FILE__, __LINE__, ITK_LOCATION);
 
   /*

diff --git a/Modules/Core/GPUCommon/src/itkOpenCLUtil.cxx b/Modules/Core/GPUCommon/src/itkOpenCLUtil.cxx
@@ -54,9 +54,7 @@ OpenCLGetAvailableDevices(cl_platform_id platform, cl_device_type devType, cl_ui
   cl_uint        totalNumDevices;
 
   // get total # of devices
-  cl_int errid;
-
-  errid = clGetDeviceIDs(platform, devType, 0, nullptr, &totalNumDevices);
+  cl_int errid = clGetDeviceIDs(platform, devType, 0, nullptr, &totalNumDevices);
   OpenCLCheckError(errid, __FILE__, __LINE__, ITK_LOCATION);
 
   auto * totalDevices = (cl_device_id *)malloc(totalNumDevices * sizeof(cl_device_id));

diff --git a/Modules/Core/ImageAdaptors/include/itkNthElementPixelAccessor.h b/Modules/Core/ImageAdaptors/include/itkNthElementPixelAccessor.h
@@ -156,9 +156,7 @@ class NthElementPixelAccessor<TOutputPixelType, itk::VariableLengthVector<TPixel
   inline ExternalType
   Get(const ActualPixelType & input) const
   {
-    ExternalType output;
-
-    output = static_cast<ExternalType>(input[m_ElementNumber]);
+    ExternalType output = static_cast<ExternalType>(input[m_ElementNumber]);
     return output;
   }
 

diff --git a/Modules/Core/ImageAdaptors/include/itkVectorImageToImageAdaptor.h b/Modules/Core/ImageAdaptors/include/itkVectorImageToImageAdaptor.h
@@ -74,9 +74,7 @@ class VectorImageToImagePixelAccessor : private DefaultVectorPixelAccessor<TType
   inline ExternalType
   Get(const ActualPixelType & input) const
   {
-    ExternalType output;
-
-    output = input[m_ComponentIdx];
+    ExternalType output = input[m_ComponentIdx];
     return output;
   }
 

diff --git a/Modules/Core/ImageFunction/include/itkMeanImageFunction.hxx b/Modules/Core/ImageFunction/include/itkMeanImageFunction.hxx
@@ -34,9 +34,7 @@ template <typename TInputImage, typename TCoordRep>
 auto
 MeanImageFunction<TInputImage, TCoordRep>::EvaluateAtIndex(const IndexType & index) const -> RealType
 {
-  RealType sum;
-
-  sum = RealType{};
+  RealType sum = RealType{};
 
   const InputImageType * const image = this->GetInputImage();
 

diff --git a/Modules/Core/ImageFunction/include/itkNeighborhoodOperatorImageFunction.h b/Modules/Core/ImageFunction/include/itkNeighborhoodOperatorImageFunction.h
@@ -90,8 +90,7 @@ class ITK_TEMPLATE_EXPORT NeighborhoodOperatorImageFunction : public ImageFuncti
   Evaluate(const PointType &) const override
   {
     std::cout << "NeighborhoodOperatorImageFunction::Evaluate(): Not implemented!" << std::endl;
-    TOutput out;
-    out = 0;
+    TOutput out = 0;
     return out;
   }
 
@@ -105,8 +104,7 @@ class ITK_TEMPLATE_EXPORT NeighborhoodOperatorImageFunction : public ImageFuncti
   EvaluateAtContinuousIndex(const ContinuousIndexType &) const override
   {
     std::cout << "NeighborhoodOperatorImageFunction::EvaluateAtContinuousIndex():Not implemented!" << std::endl;
-    TOutput out;
-    out = 0;
+    TOutput out = 0;
     return out;
   }
 

diff --git a/Modules/Core/ImageFunction/include/itkSumOfSquaresImageFunction.hxx b/Modules/Core/ImageFunction/include/itkSumOfSquaresImageFunction.hxx
@@ -35,9 +35,7 @@ template <typename TInputImage, typename TCoordRep>
 auto
 SumOfSquaresImageFunction<TInputImage, TCoordRep>::EvaluateAtIndex(const IndexType & index) const -> RealType
 {
-  RealType sumOfSquares;
-
-  sumOfSquares = RealType{};
+  RealType sumOfSquares = RealType{};
 
   const InputImageType * const image = this->GetInputImage();
 

diff --git a/Modules/Core/Mesh/include/itkConnectedRegionsMeshFilter.hxx b/Modules/Core/Mesh/include/itkConnectedRegionsMeshFilter.hxx
@@ -253,8 +253,7 @@ ConnectedRegionsMeshFilter<TInputMesh, TOutputMesh>::GenerateData()
       }
 
       // get the cells using the closest point and use them as seeds
-      InputMeshCellLinksContainerConstPointer cellLinks;
-      cellLinks = input->GetCellLinks();
+      InputMeshCellLinksContainerConstPointer cellLinks = input->GetCellLinks();
 
       auto links = cellLinks->ElementAt(minId);
       for (auto citer = links.cbegin(); citer != links.cend(); ++citer)

diff --git a/Modules/Core/SpatialObjects/include/itkContourSpatialObject.hxx b/Modules/Core/SpatialObjects/include/itkContourSpatialObject.hxx
@@ -105,8 +105,7 @@ ContourSpatialObject<TDimension>::SetControlPoints(const ContourPointListType &
 {
   m_ControlPoints.clear();
 
-  typename ContourPointListType::const_iterator it;
-  it = points.begin();
+  typename ContourPointListType::const_iterator it = points.begin();
   while (it != points.end())
   {
     m_ControlPoints.push_back(*it);
@@ -219,8 +218,7 @@ ContourSpatialObject<TDimension>::Update()
             newPoint[d] = pnt[d] + i * step[d];
           }
         }
-        typename Superclass::SpatialObjectPointType newSOPoint;
-        newSOPoint = (*it);
+        typename Superclass::SpatialObjectPointType newSOPoint = (*it);
         newSOPoint.SetSpatialObject(this);
         newSOPoint.SetPositionInObjectSpace(newPoint);
         this->m_Points.push_back(newSOPoint);

diff --git a/Modules/Core/Transform/include/itkQuaternionRigidTransform.hxx b/Modules/Core/Transform/include/itkQuaternionRigidTransform.hxx
@@ -198,9 +198,7 @@ QuaternionRigidTransform<TParametersValueType>::ComputeMatrix()
   VnlQuaternionType conjugateRotation = m_Rotation.conjugate();
   // this is done to compensate for the transposed representation
   // between VNL and ITK
-  MatrixType newMatrix;
-
-  newMatrix = conjugateRotation.rotation_matrix_transpose();
+  MatrixType newMatrix = conjugateRotation.rotation_matrix_transpose();
   this->SetVarMatrix(newMatrix);
 }
 

diff --git a/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryPruningImageFilter.hxx b/Modules/Filtering/BinaryMathematicalMorphology/include/itkBinaryPruningImageFilter.hxx
@@ -111,8 +111,7 @@ BinaryPruningImageFilter<TInputImage, TOutputImage>::ComputePruneImage()
     {
       if (ot.GetCenterPixel())
       {
-        PixelType genus;
-        genus = ot.GetPixel(offset1) + ot.GetPixel(offset2);
+        PixelType genus = ot.GetPixel(offset1) + ot.GetPixel(offset2);
         genus += ot.GetPixel(offset3) + ot.GetPixel(offset4);
         genus += ot.GetPixel(offset5) + ot.GetPixel(offset6);
         genus += ot.GetPixel(offset7) + ot.GetPixel(offset8);

diff --git a/Modules/Filtering/Convolution/include/itkMaskedFFTNormalizedCorrelationImageFilter.hxx b/Modules/Filtering/Convolution/include/itkMaskedFFTNormalizedCorrelationImageFilter.hxx
@@ -646,15 +646,13 @@ MaskedFFTNormalizedCorrelationImageFilter<TInputImage, TOutputImage, TMaskImage>
   // is bigger than our input.
 
   // Cast away the constness so we can set the requested region.
-  InputImagePointer inputPtr;
-  inputPtr = const_cast<InputImageType *>(this->GetFixedImage());
+  InputImagePointer inputPtr = const_cast<InputImageType *>(this->GetFixedImage());
   inputPtr->SetRequestedRegion(this->GetFixedImage()->GetLargestPossibleRegion());
 
   inputPtr = const_cast<InputImageType *>(this->GetMovingImage());
   inputPtr->SetRequestedRegion(this->GetMovingImage()->GetLargestPossibleRegion());
 
-  MaskImagePointer maskPtr;
-  maskPtr = const_cast<MaskImageType *>(this->GetFixedImageMask());
+  MaskImagePointer maskPtr = const_cast<MaskImageType *>(this->GetFixedImageMask());
   if (maskPtr)
   {
     maskPtr->SetRequestedRegion(this->GetFixedImageMask()->GetLargestPossibleRegion());

diff --git a/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowFunction.hxx b/Modules/Filtering/CurvatureFlow/include/itkMinMaxCurvatureFlowFunction.hxx
@@ -404,8 +404,7 @@ MinMaxCurvatureFlowFunction<TImage>::ComputeUpdate(const NeighborhoodType & it,
     return update;
   }
 
-  PixelType threshold;
-  threshold = this->ComputeThreshold(Dispatch<ImageDimension>(), it);
+  PixelType threshold = this->ComputeThreshold(Dispatch<ImageDimension>(), it);
 
   NeighborhoodInnerProduct<ImageType> innerProduct;
   PixelType                           avgValue = innerProduct(it, m_StencilOperator);

diff --git a/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingBaseImageFilter.hxx b/Modules/Filtering/Denoising/include/itkPatchBasedDenoisingBaseImageFilter.hxx
@@ -211,8 +211,7 @@ PatchBasedDenoisingBaseImageFilter<TInputImage, TOutputImage>::GetPatchRadiusInV
     thisPtr->m_InputImage = this->GetInput();
   }
   const typename InputImageType::SpacingType & spacing = this->m_InputImage->GetSpacing();
-  typename InputImageType::SpacingValueType    maxSpacing;
-  maxSpacing = spacing[0];
+  typename InputImageType::SpacingValueType    maxSpacing = spacing[0];
   for (unsigned int dim = 1; dim < ImageDimension; ++dim)
   {
     if (spacing[dim] > maxSpacing)

diff --git a/Modules/Filtering/FastMarching/include/itkFastMarchingImageFilter.hxx b/Modules/Filtering/FastMarching/include/itkFastMarchingImageFilter.hxx
@@ -136,8 +136,7 @@ FastMarchingImageFilter<TLevelSet, TSpeedImage>::Initialize(LevelSetImageType *
   // set all output value to infinity
   using OutputIterator = ImageRegionIterator<LevelSetImageType>;
 
-  PixelType outputPixel;
-  outputPixel = m_LargeValue;
+  PixelType outputPixel = m_LargeValue;
 
   for (OutputIterator outIt(output, output->GetBufferedRegion()); !outIt.IsAtEnd(); ++outIt)
   {

diff --git a/Modules/Filtering/ImageFeature/include/itkHessian3DToVesselnessMeasureImageFilter.hxx b/Modules/Filtering/ImageFeature/include/itkHessian3DToVesselnessMeasureImageFilter.hxx
@@ -53,8 +53,8 @@ Hessian3DToVesselnessMeasureImageFilter<TPixel>::GenerateData()
 
   // walk the region of eigen values and get the vesselness measure
   EigenValueArrayType                                 eigenValue;
-  ImageRegionConstIterator<EigenValueOutputImageType> it;
-  it = ImageRegionConstIterator<EigenValueOutputImageType>(eigenImage, eigenImage->GetRequestedRegion());
+  ImageRegionConstIterator<EigenValueOutputImageType> it =
+    ImageRegionConstIterator<EigenValueOutputImageType>(eigenImage, eigenImage->GetRequestedRegion());
   ImageRegionIterator<OutputImageType> oit;
   this->AllocateOutputs();
   oit = ImageRegionIterator<OutputImageType>(output, output->GetRequestedRegion());

diff --git a/Modules/Filtering/ImageGradient/include/itkVectorGradientMagnitudeImageFilter.h b/Modules/Filtering/ImageGradient/include/itkVectorGradientMagnitudeImageFilter.h
@@ -318,9 +318,7 @@ class ITK_TEMPLATE_EXPORT VectorGradientMagnitudeImageFilter : public ImageToIma
   NonPCEvaluateAtNeighborhood(const ConstNeighborhoodIteratorType & it) const
   {
     unsigned int i, j;
-    TRealType    dx, sum, accum;
-
-    accum = TRealType{};
+    TRealType    dx, sum, accum = TRealType{};
     for (i = 0; i < ImageDimension; ++i)
     {
       sum = TRealType{};

diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineControlPointImageFilter.hxx
@@ -114,8 +114,7 @@ BSplineControlPointImageFilter<TInputImage, TOutputImage>::SetSplineOrder(ArrayT
 
     if (this->m_DoMultilevel)
     {
-      typename KernelType::MatrixType C;
-      C = this->m_Kernel[i]->GetShapeFunctionsInZeroToOneInterval();
+      typename KernelType::MatrixType C = this->m_Kernel[i]->GetShapeFunctionsInZeroToOneInterval();
 
       vnl_matrix<RealType> R;
       vnl_matrix<RealType> S;

diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineResampleImageFilterBase.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineResampleImageFilterBase.hxx
@@ -377,8 +377,7 @@ BSplineResampleImageFilterBase<TInputImage, TOutputImage>::ReduceNDImage(OutputI
    * OutputImage for direct writing into the final variable. */
 
   // The first time through the loop our input image is inputPtr
-  typename TInputImage::ConstPointer workingImage;
-  workingImage = inputPtr;
+  typename TInputImage::ConstPointer workingImage = inputPtr;
 
   unsigned int     count = scratchRegion.GetNumberOfPixels() * ImageDimension;
   ProgressReporter progress(this, 0, count, 10);
@@ -491,8 +490,7 @@ BSplineResampleImageFilterBase<TInputImage, TOutputImage>::ExpandNDImage(OutputI
   **/
 
   // The first time through the loop our input image is m_Image
-  typename TInputImage::ConstPointer workingImage;
-  workingImage = inputPtr;
+  typename TInputImage::ConstPointer workingImage = inputPtr;
 
   RegionType workingRegion = validRegion;
 

diff --git a/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkBSplineScatteredDataPointSetToImageFilter.hxx
@@ -93,8 +93,7 @@ BSplineScatteredDataPointSetToImageFilter<TInputPointSet, TOutputImage>::SetSpli
 
     if (this->m_DoMultilevel)
     {
-      typename KernelType::MatrixType C;
-      C = this->m_Kernel[i]->GetShapeFunctionsInZeroToOneInterval();
+      typename KernelType::MatrixType C = this->m_Kernel[i]->GetShapeFunctionsInZeroToOneInterval();
 
       vnl_matrix<RealType> R;
       vnl_matrix<RealType> S;

diff --git a/Modules/Filtering/ImageGrid/include/itkShrinkImageFilter.hxx b/Modules/Filtering/ImageGrid/include/itkShrinkImageFilter.hxx
@@ -310,8 +310,7 @@ ShrinkImageFilter<TInputImage, TOutputImage>::GenerateOutputInformation()
   outputPtr->TransformContinuousIndexToPhysicalPoint(outputCenterIndex, outputCenterPoint);
 
   const typename TOutputImage::PointType & inputOrigin = inputPtr->GetOrigin();
-  typename TOutputImage::PointType         outputOrigin;
-  outputOrigin = inputOrigin + (inputCenterPoint - outputCenterPoint);
+  typename TOutputImage::PointType         outputOrigin = inputOrigin + (inputCenterPoint - outputCenterPoint);
   outputPtr->SetOrigin(outputOrigin);
 
   // Set region

diff --git a/Modules/Filtering/ImageIntensity/include/itkAdaptImageFilter.h b/Modules/Filtering/ImageIntensity/include/itkAdaptImageFilter.h
@@ -165,9 +165,7 @@ class AdaptImageFilter
   void
   SetAccessor(AccessorType & accessor)
   {
-    FunctorType functor;
-
-    functor = this->GetFunctor();
+    FunctorType functor = this->GetFunctor();
     if (accessor != functor.GetAccessor())
     {
       functor.SetAccessor(accessor);

diff --git a/Modules/Filtering/ImageIntensity/include/itkPolylineMaskImageFilter.hxx b/Modules/Filtering/ImageIntensity/include/itkPolylineMaskImageFilter.hxx
@@ -92,17 +92,14 @@ PolylineMaskImageFilter<TInputImage, TPolyline, TVector, TOutputImage>::Generate
   itkDebugMacro("Normalized View vector" << nViewVector);
 
   // Orthogonalize nUpVector and nViewVector
-  TVector nOrthogonalVector;
-
-  nOrthogonalVector = nUpVector - (nViewVector * (nUpVector * nViewVector));
+  TVector nOrthogonalVector = nUpVector - (nViewVector * (nUpVector * nViewVector));
 
   itkDebugMacro("Up vector component orthogonal to View vector " << nOrthogonalVector);
 
   // Perform the cross product and determine a third coordinate axis
   // orthogonal to both nOrthogonalVector and nViewVector.
 
-  TVector nThirdAxis;
-  nThirdAxis = itk::CrossProduct(nOrthogonalVector, nViewVector);
+  TVector nThirdAxis = itk::CrossProduct(nOrthogonalVector, nViewVector);
 
   itkDebugMacro("Third basis vector" << nThirdAxis);
 
@@ -298,9 +295,7 @@ PolylineMaskImageFilter<TInputImage, TPolyline, TVector, TOutputImage>::Generate
   projectionStart[1] = 0;
 
   ProjectionImageSizeType projectionSize;
-  IndexValueType          pad;
-
-  pad = 5;
+  IndexValueType          pad = 5;
 
   projectionSize[0] = (IndexValueType)(bounds[1] - bounds[0]) + pad;
   projectionSize[1] = (IndexValueType)(bounds[3] - bounds[2]) + pad;