Merge pull request #29 from jbvimort/memory-access

Memory access

Author: thewtex

include/itkCoocurrenceTextureFeaturesImageFilter.h

@@ -239,7 +239,6 @@ class ITK_TEMPLATE_EXPORT CoocurrenceTextureFeaturesImageFilter:public ImageToIm
   PixelType                         m_Min;
   PixelType                         m_Max;
   PixelType                         m_InsidePixelValue;
-  typename TInputImage::SpacingType m_Spacing;
   bool                              m_Normalize;
 
 

include/itkCoocurrenceTextureFeaturesImageFilter.hxx

@@ -56,7 +56,7 @@ CoocurrenceTextureFeaturesImageFilter< TInputImage, TOutputImage >
   // connected to the iterated pixel. Do not include the currentInNeighborhood pixel.
   unsigned int centerIndex = hood.GetCenterNeighborhoodIndex();
   OffsetVectorPointer offsets = OffsetVector::New();
-  for( unsigned int d = 0; d < centerIndex; d++ )
+  for( unsigned int d = 0; d < centerIndex; ++d )
     {
     OffsetType offset = hood.GetOffset( d );
     offsets->push_back( offset );
@@ -146,7 +146,7 @@ CoocurrenceTextureFeaturesImageFilter<TInputImage, TOutputImage>
   // Declaration of the variables useful to iterate over the all image region
   bool isInImage;
   IndexType firstIndex;
-  for ( unsigned int i = 0; i < this->m_NeighborhoodRadius.Dimension; i++ )
+  for ( unsigned int i = 0; i < this->m_NeighborhoodRadius.Dimension; ++i )
     {
     firstIndex[i] = 0;
     }
@@ -228,8 +228,8 @@ CoocurrenceTextureFeaturesImageFilter<TInputImage, TOutputImage>
             }
 
           // Increase the corresponding bin in the histogram
-          totalNumberOfFreq++;
-          hist[currentInNeighborhoodPixelIntensity][pixelIntensity]++;
+          ++totalNumberOfFreq;
+          ++hist[currentInNeighborhoodPixelIntensity][pixelIntensity];
           }
         }
       // Compute the run length features
@@ -337,9 +337,9 @@ CoocurrenceTextureFeaturesImageFilter<TInputImage, TOutputImage>
       }
     const double log2 = std::log(2.0);
 
-    for(unsigned int a = 0; a < m_NumberOfBinsPerAxis; a++)
+    for(unsigned int a = 0; a < m_NumberOfBinsPerAxis; ++a)
       {
-      for(unsigned int b = 0; b < m_NumberOfBinsPerAxis; b++)
+      for(unsigned int b = 0; b < m_NumberOfBinsPerAxis; ++b)
         {
         float frequency = hist[a][b] / (float)totalNumberOfFreq;
         if ( Math::AlmostEquals( frequency, NumericTraits< float >::ZeroValue() ) )
@@ -458,26 +458,23 @@ CoocurrenceTextureFeaturesImageFilter<TInputImage, TOutputImage>
 
   itkPrintSelfObjectMacro( DigitalizedInputImage );
 
-  os << indent << "NeighborhoodRadius"
+  os << indent << "NeighborhoodRadius: "
     << static_cast< typename NumericTraits<
     NeighborhoodRadiusType >::PrintType >( m_NeighborhoodRadius ) << std::endl;
 
   itkPrintSelfObjectMacro( Offsets );
 
-  os << indent << "NumberOfBinsPerAxis" << m_NumberOfBinsPerAxis << std::endl;
-  os << indent << "Min"
+  os << indent << "NumberOfBinsPerAxis: " << m_NumberOfBinsPerAxis << std::endl;
+  os << indent << "Min: "
     << static_cast< typename NumericTraits< PixelType >::PrintType >( m_Min )
     << std::endl;
-  os << indent << "Max"
+  os << indent << "Max: "
     << static_cast< typename NumericTraits< PixelType >::PrintType >( m_Max )
     << std::endl;
-  os << indent << "InsidePixelValue"
+  os << indent << "InsidePixelValue: "
     << static_cast< typename NumericTraits< PixelType >::PrintType >(
     m_InsidePixelValue ) << std::endl;
-  os << indent << "Spacing"
-    << static_cast< typename NumericTraits<
-    typename TInputImage::SpacingType >::PrintType >( m_Spacing ) << std::endl;
-  os << indent << "Normalize" << m_Normalize << std::endl;
+  os << indent << "Normalize: " << m_Normalize << std::endl;
 }
 } // end of namespace Statistics
 } // end of namespace itk

include/itkRunLengthTextureFeaturesImageFilter.hxx

@@ -52,7 +52,7 @@ RunLengthTextureFeaturesImageFilter< TInputImage, TOutputImage >
   // connected to the iterated pixel. Do not include the currentInNeighborhood pixel.
   unsigned int centerIndex = hood.GetCenterNeighborhoodIndex();
   OffsetVectorPointer offsets = OffsetVector::New();
-  for( unsigned int d = 0; d < centerIndex; d++ )
+  for( unsigned int d = 0; d < centerIndex; ++d )
     {
     OffsetType offset = hood.GetOffset( d );
     offsets->push_back( offset );
@@ -145,7 +145,7 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage>
   IndexType            boolCurentInNeighborhoodIndex;
   typedef Image<bool, TInputImage::ImageDimension> BoolImageType;
   typename BoolImageType::Pointer alreadyVisitedImage = BoolImageType::New();
-  for ( unsigned int i = 0; i < this->m_NeighborhoodRadius.Dimension; i++ )
+  for ( unsigned int i = 0; i < this->m_NeighborhoodRadius.Dimension; ++i )
     {
     boolSize[i] = this->m_NeighborhoodRadius[i]*2 + 1;
     boolStart[i] = 0;
@@ -206,9 +206,9 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage>
         continue;
         }
       // Initialisation of the histogram
-      for(unsigned int a = 0; a < m_NumberOfBinsPerAxis; a++)
+      for(unsigned int a = 0; a < m_NumberOfBinsPerAxis; ++a)
         {
-        for(unsigned int b = 0; b < m_NumberOfBinsPerAxis; b++)
+        for(unsigned int b = 0; b < m_NumberOfBinsPerAxis; ++b)
           {
           histogram[a][b] = 0;
           }
@@ -256,7 +256,7 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage>
             if ( pixelIntensity == currentInNeighborhoodPixelIntensity )
               {
                 alreadyVisitedImage->SetPixel( boolCurentInNeighborhoodIndex + iteratedOffset, true );
-                pixelDistance++;
+                ++pixelDistance;
                 iteratedOffset += offset;
                 insideNeighborhood = this->IsInsideNeighborhood(iteratedOffset);
               }
@@ -266,9 +266,11 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage>
               }
             }
           // Increase the corresponding bin in the histogram
+
           this->IncreaseHistogram(histogram, totalNumberOfRuns,
-                                   currentInNeighborhoodPixelIntensity,
-                                   offset, pixelDistance);
+                                  currentInNeighborhoodPixelIntensity,
+                                  offset, pixelDistance);
+
           }
         }
       // Compute the run length features
@@ -283,9 +285,9 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage>
 
   for(unsigned int axis = 0; axis < m_NumberOfBinsPerAxis; ++axis)
     {
-    delete histogram[axis];
+    delete[] histogram[axis];
     }
-  delete histogram;
+  delete[] histogram;
 }
 
 template<typename TInputImage, typename TOutputImage>
@@ -405,14 +407,12 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage>
     offsetDistance += (offset[i]*m_Spacing[i])*(offset[i]*m_Spacing[i]);
     }
   offsetDistance = std::sqrt(offsetDistance);
-
   int offsetDistanceBin = static_cast< int>(( offsetDistance*pixelDistance - m_MinDistance)/
           ( (m_MaxDistance - m_MinDistance) / (float)m_NumberOfBinsPerAxis ));
-
-  if (offsetDistanceBin < static_cast< int >( m_NumberOfBinsPerAxis ))
+  if (offsetDistanceBin < static_cast< int >( m_NumberOfBinsPerAxis ) && offsetDistanceBin >= 0)
     {
-    totalNumberOfRuns++;
-    histogram[currentInNeighborhoodPixelIntensity][offsetDistanceBin]++;
+    ++totalNumberOfRuns;
+    ++histogram[currentInNeighborhoodPixelIntensity][offsetDistanceBin];
     }
 }
 
@@ -438,9 +438,9 @@ RunLengthTextureFeaturesImageFilter<TInputImage, TOutputImage>
   vnl_vector<double> runLengthNonuniformityVector(
     m_NumberOfBinsPerAxis, 0.0 );
 
-  for(unsigned int a = 0; a < m_NumberOfBinsPerAxis; a++)
+  for(unsigned int a = 0; a < m_NumberOfBinsPerAxis; ++a)
     {
-    for(unsigned int b = 0; b < m_NumberOfBinsPerAxis; b++)
+    for(unsigned int b = 0; b < m_NumberOfBinsPerAxis; ++b)
       {
       OutputRealType frequency = histogram[a][b];
       if ( Math::ExactlyEquals(frequency, NumericTraits<OutputRealType>::ZeroValue()) )