API tools faq
paste
Advertisement
petesh

InsightToolkit-3.16.0-buildclang.diff

petesh
Sep 3rd, 2015
251
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 12.98 KB | None | 0 0
raw download clone embed print report
  1. diff -Naur InsightToolkit-3.16.0/Code/Algorithms/itkCurvesLevelSetFunction.h InsightToolkit-3.16.0.new/Code/Algorithms/itkCurvesLevelSetFunction.h
  2. --- InsightToolkit-3.16.0/Code/Algorithms/itkCurvesLevelSetFunction.h   2008-10-23 17:15:23.000000000 +0100
  3. +++ InsightToolkit-3.16.0.new/Code/Algorithms/itkCurvesLevelSetFunction.h   2015-09-03 13:20:13.000000000 +0100
  4. @@ -99,7 +99,7 @@
  5.    /** The curvature speed is same as the propagation speed. */
  6.    virtual ScalarValueType CurvatureSpeed(const NeighborhoodType & neighborhood,
  7.                                           const FloatOffsetType & offset, GlobalDataStruct *gd ) const
  8. -  { return PropagationSpeed( neighborhood, offset, gd ); }
  9. +  { return this->PropagationSpeed( neighborhood, offset, gd ); }
  10.  
  11.    /** Set/Get the sigma for the Gaussian kernel used to compute the gradient
  12.     * of the feature image needed for the advection term of the equation. */
  13. diff -Naur InsightToolkit-3.16.0/Code/Algorithms/itkGeodesicActiveContourLevelSetFunction.h InsightToolkit-3.16.0.new/Code/Algorithms/itkGeodesicActiveContourLevelSetFunction.h
  14. --- InsightToolkit-3.16.0/Code/Algorithms/itkGeodesicActiveContourLevelSetFunction.h    2008-12-21 19:13:11.000000000 +0000
  15. +++ InsightToolkit-3.16.0.new/Code/Algorithms/itkGeodesicActiveContourLevelSetFunction.h    2015-09-03 13:19:37.000000000 +0100
  16. @@ -114,7 +114,7 @@
  17.    virtual ScalarValueType CurvatureSpeed(const NeighborhoodType & neighborhood,
  18.                                           const FloatOffsetType & offset, GlobalDataStruct *gd ) const
  19.      {
  20. -    return PropagationSpeed( neighborhood, offset, gd );
  21. +    return this->PropagationSpeed( neighborhood, offset, gd );
  22.      }
  23.  
  24.    /** Set/Get the sigma for the Gaussian kernel used to compute the gradient
  25. diff -Naur InsightToolkit-3.16.0/Code/Algorithms/itkGeodesicActiveContourShapePriorLevelSetFunction.h InsightToolkit-3.16.0.new/Code/Algorithms/itkGeodesicActiveContourShapePriorLevelSetFunction.h
  26. --- InsightToolkit-3.16.0/Code/Algorithms/itkGeodesicActiveContourShapePriorLevelSetFunction.h  2008-12-21 19:13:12.000000000 +0000
  27. +++ InsightToolkit-3.16.0.new/Code/Algorithms/itkGeodesicActiveContourShapePriorLevelSetFunction.h  2015-09-03 13:19:14.000000000 +0100
  28. @@ -130,7 +130,7 @@
  29.    /** The curvature speed is same as the propagation speed. */
  30.    virtual ScalarValueType CurvatureSpeed(const NeighborhoodType & neighborhood,
  31.                                           const FloatOffsetType & offset, GlobalDataStruct *gd ) const
  32. -    { return PropagationSpeed( neighborhood, offset, gd ); }
  33. +    { return this->PropagationSpeed( neighborhood, offset, gd ); }
  34.  
  35.    /** Set/Get the sigma for the Gaussian kernel used to compute the gradient
  36.     * of the feature image needed for the advection term of the equation. */
  37. diff -Naur InsightToolkit-3.16.0/Code/Algorithms/itkShapeDetectionLevelSetFunction.h InsightToolkit-3.16.0.new/Code/Algorithms/itkShapeDetectionLevelSetFunction.h
  38. --- InsightToolkit-3.16.0/Code/Algorithms/itkShapeDetectionLevelSetFunction.h   2009-01-27 19:30:15.000000000 +0000
  39. +++ InsightToolkit-3.16.0.new/Code/Algorithms/itkShapeDetectionLevelSetFunction.h   2015-09-03 13:12:47.000000000 +0100
  40. @@ -103,7 +103,7 @@
  41.    /** The curvature speed is same as the propagation speed. */
  42.    virtual ScalarValueType CurvatureSpeed(const NeighborhoodType & neighborhood,
  43.                                           const FloatOffsetType & offset, GlobalDataStruct *gd ) const
  44. -  { return PropagationSpeed( neighborhood, offset, gd ); }
  45. +  { return this->PropagationSpeed( neighborhood, offset, gd ); }
  46.  
  47.    virtual void Initialize(const RadiusType &r)
  48.      {
  49. diff -Naur InsightToolkit-3.16.0/Code/Algorithms/itkVoronoiPartitioningImageFilter.txx InsightToolkit-3.16.0.new/Code/Algorithms/itkVoronoiPartitioningImageFilter.txx
  50. --- InsightToolkit-3.16.0/Code/Algorithms/itkVoronoiPartitioningImageFilter.txx 2009-01-27 19:30:17.000000000 +0000
  51. +++ InsightToolkit-3.16.0.new/Code/Algorithms/itkVoronoiPartitioningImageFilter.txx 2015-09-03 13:22:36.000000000 +0100
  52. @@ -129,7 +129,7 @@
  53.        {
  54.        if ((*nit)>i)
  55.          {
  56. -        drawLine(this->m_WorkingVD->GetSeed(i),this->m_WorkingVD->GetSeed(*nit));
  57. +        this->drawLine(this->m_WorkingVD->GetSeed(i),this->m_WorkingVD->GetSeed(*nit));
  58.          i=i;
  59.          }
  60.        }
  61. @@ -164,7 +164,7 @@
  62.        VertList.push_back(currP);
  63.        }
  64.      // Need to fill with an segment identifier
  65. -    FillPolygon(VertList, static_cast<OutputPixelType>(i));
  66. +    this->FillPolygon(VertList, static_cast<OutputPixelType>(i));
  67.      }
  68.  }
  69.  
  70. diff -Naur InsightToolkit-3.16.0/Code/BasicFilters/itkBloxBoundaryPointImageToBloxBoundaryProfileImageFilter.txx InsightToolkit-3.16.0.new/Code/BasicFilters/itkBloxBoundaryPointImageToBloxBoundaryProfileImageFilter.txx
  71. --- InsightToolkit-3.16.0/Code/BasicFilters/itkBloxBoundaryPointImageToBloxBoundaryProfileImageFilter.txx   2009-05-07 15:03:37.000000000 +0100
  72. +++ InsightToolkit-3.16.0.new/Code/BasicFilters/itkBloxBoundaryPointImageToBloxBoundaryProfileImageFilter.txx   2015-09-03 13:08:35.000000000 +0100
  73. @@ -502,7 +502,7 @@
  74.  ::SetInput1(const SourceImageType * image1 )
  75.  {
  76.    // Process object is not const-correct so the const casting is required.
  77. -  SetNthInput(1,  const_cast<SourceImageType *>( image1 ) );
  78. +  this->SetNthInput(1,  const_cast<SourceImageType *>( image1 ) );
  79.  }
  80.  
  81.  template< typename TSourceImage >
  82. @@ -511,7 +511,7 @@
  83.  ::SetInput2(const BoundaryPointImageType * image2 )
  84.  {
  85.    // Process object is not const-correct so the const casting is required.
  86. -  SetNthInput(0, const_cast<BoundaryPointImageType *>( image2 ) );
  87. +  this->SetNthInput(0, const_cast<BoundaryPointImageType *>( image2 ) );
  88.  }
  89.  
  90.  } // end namespace
  91. diff -Naur InsightToolkit-3.16.0/Code/BasicFilters/itkBloxBoundaryProfileImageToBloxCoreAtomImageFilter.txx InsightToolkit-3.16.0.new/Code/BasicFilters/itkBloxBoundaryProfileImageToBloxCoreAtomImageFilter.txx
  92. --- InsightToolkit-3.16.0/Code/BasicFilters/itkBloxBoundaryProfileImageToBloxCoreAtomImageFilter.txx    2006-03-19 04:36:56.000000000 +0000
  93. +++ InsightToolkit-3.16.0.new/Code/BasicFilters/itkBloxBoundaryProfileImageToBloxCoreAtomImageFilter.txx    2015-09-03 13:09:15.000000000 +0100
  94. @@ -46,7 +46,7 @@
  95.  ::SetInput1(const SourceImageType * image1 )
  96.  {
  97.    // Process object is not const-correct so the const casting is required.
  98. -  SetNthInput(1,  const_cast<SourceImageType *>( image1 ) );
  99. +  this->SetNthInput(1,  const_cast<SourceImageType *>( image1 ) );
  100.  }
  101.  
  102.  template< typename TInputImage, typename TOutputImage, typename TSourceImage >
  103. @@ -55,7 +55,7 @@
  104.  ::SetInput2(const InputImageType * image2 )
  105.  {
  106.    // Process object is not const-correct so the const casting is required.
  107. -  SetNthInput(0, const_cast<InputImageType *>( image2 ) );
  108. +  this->SetNthInput(0, const_cast<InputImageType *>( image2 ) );
  109.  }
  110.  
  111.  
  112. diff -Naur InsightToolkit-3.16.0/Code/BasicFilters/itkTernaryFunctorImageFilter.txx InsightToolkit-3.16.0.new/Code/BasicFilters/itkTernaryFunctorImageFilter.txx
  113. --- InsightToolkit-3.16.0/Code/BasicFilters/itkTernaryFunctorImageFilter.txx    2008-10-18 17:11:14.000000000 +0100
  114. +++ InsightToolkit-3.16.0.new/Code/BasicFilters/itkTernaryFunctorImageFilter.txx    2015-09-03 13:03:20.000000000 +0100
  115. @@ -46,7 +46,7 @@
  116.  ::SetInput1( const TInputImage1 *image1 )
  117.  {
  118.    // The ProcessObject is not const-correct so the const_cast is required here
  119. -  SetNthInput( 0, const_cast<TInputImage1 *>( image1 ) );
  120. +  this->SetNthInput( 0, const_cast<TInputImage1 *>( image1 ) );
  121.  }
  122.  
  123.  /**
  124. @@ -59,7 +59,7 @@
  125.  ::SetInput2( const TInputImage2 *image2 )
  126.  {
  127.    // The ProcessObject is not const-correct so the const_cast is required here
  128. -  SetNthInput( 1, const_cast<TInputImage2 *>( image2 ) );
  129. +  this->SetNthInput( 1, const_cast<TInputImage2 *>( image2 ) );
  130.  }
  131.  
  132.  /**
  133. @@ -72,7 +72,7 @@
  134.  ::SetInput3( const TInputImage3 *image3 )
  135.  {
  136.    // The ProcessObject is not const-correct so the const_cast is required here
  137. -  SetNthInput( 2, const_cast<TInputImage3 *>( image3 ) );
  138. +  this->SetNthInput( 2, const_cast<TInputImage3 *>( image3 ) );
  139.  }
  140.  
  141.  /**
  142. diff -Naur InsightToolkit-3.16.0/Code/Common/itkKLMSegmentationBorder.h InsightToolkit-3.16.0.new/Code/Common/itkKLMSegmentationBorder.h
  143. --- InsightToolkit-3.16.0/Code/Common/itkKLMSegmentationBorder.h    2009-02-05 19:04:58.000000000 +0000
  144. +++ InsightToolkit-3.16.0.new/Code/Common/itkKLMSegmentationBorder.h    2015-09-03 12:46:36.000000000 +0100
  145. @@ -81,11 +81,11 @@
  146.  
  147.    bool operator> (const KLMDynamicBorderArray<TBorder>* rhs) const
  148.      {
  149. -    if( m_Pointer->GetLambda() == rhs.m_Pointer->GetLambda() )
  150. +    if( m_Pointer->GetLambda() == rhs->m_Pointer->GetLambda() )
  151.        {
  152.        if( m_Pointer->GetLambda() < 0 )
  153.          {
  154. -        return ( m_Pointer > rhs.m_Pointer );
  155. +        return ( m_Pointer > rhs->m_Pointer );
  156.          }
  157.        else
  158.          {
  159. @@ -100,13 +100,13 @@
  160.            static_cast< double>(m_Pointer->GetRegion2()->GetRegionBorderSize() ));
  161.  
  162.          double v2 = vnl_math_max(
  163. -          static_cast< double>(rhs.m_Pointer->GetRegion1()->GetRegionBorderSize()),
  164. -          static_cast< double>(rhs.m_Pointer->GetRegion2()->GetRegionBorderSize()) );
  165. +          static_cast< double>(rhs->m_Pointer->GetRegion1()->GetRegionBorderSize()),
  166. +          static_cast< double>(rhs->m_Pointer->GetRegion2()->GetRegionBorderSize()) );
  167.  
  168.          return ( v1 > v2 );
  169.          }
  170.        }
  171. -    return(m_Pointer->GetLambda() > rhs.m_Pointer->GetLambda() );
  172. +    return(m_Pointer->GetLambda() > rhs->m_Pointer->GetLambda() );
  173.      }
  174.  
  175.    TBorder *m_Pointer;
  176. diff -Naur InsightToolkit-3.16.0/Code/Common/itkParametricPath.txx InsightToolkit-3.16.0.new/Code/Common/itkParametricPath.txx
  177. --- InsightToolkit-3.16.0/Code/Common/itkParametricPath.txx 2009-02-19 19:41:22.000000000 +0000
  178. +++ InsightToolkit-3.16.0.new/Code/Common/itkParametricPath.txx 2015-09-03 12:51:22.000000000 +0100
  179. @@ -43,7 +43,7 @@
  180.    ContinuousIndexType continuousIndex;
  181.    IndexType           index;
  182.    
  183. -  continuousIndex = Evaluate( input );
  184. +  continuousIndex = this->Evaluate( input );
  185.    
  186.    // Round each coordinate to the nearest integer value
  187.    for( unsigned int i=0; i<VDimension; i++ )
  188. @@ -134,7 +134,7 @@
  189.      inputStepSize = this->EndOfInput() - input;
  190.      }
  191.    
  192. -  return ( Evaluate(input + inputStepSize) - Evaluate(input) ) / inputStepSize;
  193. +  return ( this->Evaluate(input + inputStepSize) - this->Evaluate(input) ) / inputStepSize;
  194.  }
  195.  
  196.  template<unsigned int VDimension>
  197. diff -Naur InsightToolkit-3.16.0/Code/Common/itkPoint.txx InsightToolkit-3.16.0.new/Code/Common/itkPoint.txx
  198. --- InsightToolkit-3.16.0/Code/Common/itkPoint.txx  2007-01-23 13:15:24.000000000 +0000
  199. +++ InsightToolkit-3.16.0.new/Code/Common/itkPoint.txx  2015-09-03 13:09:44.000000000 +0100
  200. @@ -256,7 +256,7 @@
  201.  ::SetToBarycentricCombination( const Self * P,
  202.                                 const double * weights, unsigned int N )
  203.  {
  204. -  Fill( NumericTraits<T>::Zero ); // put this point to null
  205. +  this->Fill( NumericTraits<T>::Zero ); // put this point to null
  206.    double weightSum = 0.0;
  207.    for( unsigned int j=0; j<N-1; j++)
  208.      {
  209. diff -Naur InsightToolkit-3.16.0/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx InsightToolkit-3.16.0.new/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx
  210. --- InsightToolkit-3.16.0/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx   2009-03-04 19:29:54.000000000 +0000
  211. +++ InsightToolkit-3.16.0.new/Code/Numerics/Statistics/itkWeightedCentroidKdTreeGenerator.txx   2015-09-03 12:53:49.000000000 +0100
  212. @@ -117,13 +117,13 @@
  213.    upperBound[partitionDimension] = partitionValue;
  214.    const unsigned int beginLeftIndex = beginIndex;
  215.    const unsigned int endLeftIndex   = medianIndex;
  216. -  KdTreeNodeType* left = GenerateTreeLoop(beginLeftIndex, endLeftIndex, lowerBound, upperBound, level + 1);
  217. +  KdTreeNodeType* left = this->GenerateTreeLoop(beginLeftIndex, endLeftIndex, lowerBound, upperBound, level + 1);
  218.    upperBound[partitionDimension] = dimensionUpperBound;
  219.  
  220.    lowerBound[partitionDimension] = partitionValue;
  221.    const unsigned int beginRightIndex = medianIndex+1;
  222.    const unsigned int endRighIndex    = endIndex;
  223. -  KdTreeNodeType* right = GenerateTreeLoop(beginRightIndex, endRighIndex, lowerBound, upperBound, level + 1);
  224. +  KdTreeNodeType* right = this->GenerateTreeLoop(beginRightIndex, endRighIndex, lowerBound, upperBound, level + 1);
  225.    lowerBound[partitionDimension] = dimensionLowerBound;
  226.  
  227.  
  228. diff -Naur InsightToolkit-3.16.0/Testing/Code/Common/itkMeshSourceGraftOutputTest.cxx InsightToolkit-3.16.0.new/Testing/Code/Common/itkMeshSourceGraftOutputTest.cxx
  229. --- InsightToolkit-3.16.0/Testing/Code/Common/itkMeshSourceGraftOutputTest.cxx  2007-08-20 14:00:21.000000000 +0100
  230. +++ InsightToolkit-3.16.0.new/Testing/Code/Common/itkMeshSourceGraftOutputTest.cxx  2015-09-03 13:00:51.000000000 +0100
  231. @@ -150,7 +150,7 @@
  232.    std::cout << "Filter: " << filter;
  233.  
  234.    // Get the Smart Pointer to the Filter Output
  235. -  GraftOutput( filter->GetOutput() );
  236. +  this->GraftOutput( filter->GetOutput() );
  237.  /*
  238.    outputMesh->SetBufferedRegion( outputMesh->GetRequestedRegion() );
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!