STYLE: Declare "PerThreadVariables" data member as std::vector

Follow-up to pull request #644 commit 398cea9 "STYLE: Declared `m_ComputePerThreadVariables` as an `std::vector` (2 x)"

Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.h

@@ -217,7 +217,7 @@ class ITK_TEMPLATE_EXPORT ParzenWindowHistogramImageToImageMetric
   ParzenWindowHistogramImageToImageMetric();
 
   /** The destructor. */
-  ~ParzenWindowHistogramImageToImageMetric() override;
+  ~ParzenWindowHistogramImageToImageMetric() override = default;
 
   /** Print Self. */
   void
@@ -501,9 +501,8 @@ class ITK_TEMPLATE_EXPORT ParzenWindowHistogramImageToImageMetric
   itkAlignedTypedef(ITK_CACHE_LINE_ALIGNMENT,
                     PaddedParzenWindowHistogramGetValueAndDerivativePerThreadStruct,
                     AlignedParzenWindowHistogramGetValueAndDerivativePerThreadStruct);
-  mutable AlignedParzenWindowHistogramGetValueAndDerivativePerThreadStruct *
-                       m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables;
-  mutable ThreadIdType m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariablesSize;
+  mutable std::vector<AlignedParzenWindowHistogramGetValueAndDerivativePerThreadStruct>
+    m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables;
 
   /** Variables that can/should be accessed by their Set/Get functions. */
   unsigned long m_NumberOfFixedHistogramBins;

Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.hxx

@@ -71,24 +71,9 @@ ParzenWindowHistogramImageToImageMetric<TFixedImage, TMovingImage>::ParzenWindow
   /** Initialize the m_ParzenWindowHistogramThreaderParameters */
   this->m_ParzenWindowHistogramThreaderParameters.m_Metric = this;
 
-  // Multi-threading structs
-  this->m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables = nullptr;
-  this->m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariablesSize = 0;
-
 } // end Constructor
 
 
-/**
- * ******************* Destructor *******************
- */
-
-template <class TFixedImage, class TMovingImage>
-ParzenWindowHistogramImageToImageMetric<TFixedImage, TMovingImage>::~ParzenWindowHistogramImageToImageMetric()
-{
-  delete[] this->m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables;
-} // end Destructor
-
-
 /**
  * ********************* PrintSelf ******************************
  */
@@ -458,22 +443,15 @@ ParzenWindowHistogramImageToImageMetric<TFixedImage, TMovingImage>::InitializeTh
   const ThreadIdType numberOfThreads = Self::GetNumberOfWorkUnits();
 
   /** Only resize the array of structs when needed. */
-  if (this->m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariablesSize != numberOfThreads)
-  {
-    delete[] this->m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables;
-    this->m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables =
-      new AlignedParzenWindowHistogramGetValueAndDerivativePerThreadStruct[numberOfThreads];
-    this->m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariablesSize = numberOfThreads;
-  }
+  m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables.resize(numberOfThreads);
 
   /** Some initialization. */
-  for (ThreadIdType i = 0; i < numberOfThreads; ++i)
+  for (auto & perThreadVariable : m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables)
   {
-    this->m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables[i].st_NumberOfPixelsCounted =
-      NumericTraits<SizeValueType>::Zero;
+    perThreadVariable.st_NumberOfPixelsCounted = 0;
 
     // Initialize the joint pdf
-    JointPDFPointer & jointPDF = this->m_ParzenWindowHistogramGetValueAndDerivativePerThreadVariables[i].st_JointPDF;
+    JointPDFPointer & jointPDF = perThreadVariable.st_JointPDF;
     if (jointPDF.IsNull())
     {
       jointPDF = JointPDFType::New();