Merge pull request #43 from blowekamp/fix_valgrind_defects

Fixes valgrind defects

Author: blowekamp

include/itkLabelSetDilateImageFilter.hxx

@@ -51,12 +51,12 @@ LabelSetDilateImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
   }
   float progressPerDimension = 1.0 / ImageDimension;
 
-  auto * progress = new ProgressReporter(this,
-                                         threadId,
-                                         NumberOfRows[this->m_CurrentDimension],
-                                         30,
-                                         this->m_CurrentDimension * progressPerDimension,
-                                         progressPerDimension);
+  ProgressReporter progress(this,
+                            threadId,
+                            NumberOfRows[this->m_CurrentDimension],
+                            30,
+                            this->m_CurrentDimension * progressPerDimension,
+                            progressPerDimension);
 
   // this is where the work happens. We use a distance image with
   // floating point pixel to perform the parabolic operations. The
@@ -114,7 +114,7 @@ LabelSetDilateImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
           inputIterator,
           outputDistIterator,
           outputIterator,
-          *progress,
+          progress,
           LineLength,
           this->m_CurrentDimension,
           this->m_MagnitudeSign,
@@ -132,7 +132,7 @@ LabelSetDilateImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
                                              inputDistIterator,
                                              outputDistIterator,
                                              outputIterator,
-                                             *progress,
+                                             progress,
                                              LineLength,
                                              this->m_CurrentDimension,
                                              this->m_MagnitudeSign,

include/itkLabelSetErodeImageFilter.hxx

@@ -59,12 +59,12 @@ LabelSetErodeImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
   }
   float progressPerDimension = 1.0 / ImageDimension;
 
-  auto * progress = new ProgressReporter(this,
-                                         threadId,
-                                         NumberOfRows[this->m_CurrentDimension],
-                                         30,
-                                         this->m_CurrentDimension * progressPerDimension,
-                                         progressPerDimension);
+  ProgressReporter progress(this,
+                            threadId,
+                            NumberOfRows[this->m_CurrentDimension],
+                            30,
+                            this->m_CurrentDimension * progressPerDimension,
+                            progressPerDimension);
 
   using InputConstIteratorType = ImageLinearConstIteratorWithIndex<TInputImage>;
   using OutputIteratorType = ImageLinearIteratorWithIndex<TOutputImage>;
@@ -109,7 +109,7 @@ LabelSetErodeImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
           inputIterator,
           outputDistIterator,
           outputIterator,
-          *progress,
+          progress,
           LineLength,
           this->m_CurrentDimension,
           this->m_MagnitudeSign,
@@ -129,7 +129,7 @@ LabelSetErodeImageFilter<TInputImage, TOutputImage>::ThreadedGenerateData(
                                             inputDistIterator,
                                             outputDistIterator,
                                             outputIterator,
-                                            *progress,
+                                            progress,
                                             LineLength,
                                             this->m_CurrentDimension,
                                             this->m_MagnitudeSign,

include/itkLabelSetMorphBaseImageFilter.hxx

@@ -50,7 +50,7 @@ LabelSetMorphBaseImageFilter<TInputImage, doDilate, TOutputImage>::LabelSetMorph
   }
   m_UseImageSpacing = false;
 
-  this->SetRadius(1);
+  this->m_Radius.Fill(1);
 
   this->DynamicMultiThreadingOff();
 }