From e0561dae1fa08ae95f620029a50de7a370e55d04 Mon Sep 17 00:00:00 2001 From: Vivien Delmon Date: Mon, 5 Sep 2011 11:06:10 +0200 Subject: [PATCH] itkv4 Replace ITK_TYPENAME by typename - ITK_TYPENAME disappeared in itkv4. It was in itkv3 to remove some warning with MS VC++ 6.0 which is not supported by itk anymore. --- itk/clitkVectorBSplineResampleImageFunction.h | 4 ++-- ...litkVectorBSplineResampleImageFunctionWithLUT.h | 4 ++-- itk/itkBSplineResampleImageFunctionWithLUT.h | 4 ++-- .../clitkCorrelationRatioImageToImageMetric.txx | 8 ++++---- ...litkNormalizedCorrelationImageToImageMetric.txx | 14 +++++++------- ...edCorrelationImageToImageMetricFor3DBLUTFFD.txx | 14 +++++++------- ...kOptNormalizedCorrelationImageToImageMetric.txx | 6 +++--- ...edCorrelationImageToImageMetricFor3DBLUTFFD.txx | 6 +++--- ...tkMeanSquaresImageToImageMetricFor3DBLUTFFD.txx | 4 ++-- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/itk/clitkVectorBSplineResampleImageFunction.h b/itk/clitkVectorBSplineResampleImageFunction.h index 8668392..96a51cb 100644 --- a/itk/clitkVectorBSplineResampleImageFunction.h +++ b/itk/clitkVectorBSplineResampleImageFunction.h @@ -43,12 +43,12 @@ namespace clitk template class ITK_EXPORT VectorBSplineResampleImageFunction : public VectorBSplineInterpolateImageFunction< - TImageType,TCoordRep,ITK_TYPENAME TImageType::PixelType::ValueType > + TImageType,TCoordRep, typename TImageType::PixelType::ValueType > { public: /** Standard class typedefs. */ typedef VectorBSplineResampleImageFunction Self; - typedef VectorBSplineInterpolateImageFunction Superclass; + typedef VectorBSplineInterpolateImageFunction Superclass; typedef itk::SmartPointer Pointer; typedef itk::SmartPointer ConstPointer; diff --git a/itk/clitkVectorBSplineResampleImageFunctionWithLUT.h b/itk/clitkVectorBSplineResampleImageFunctionWithLUT.h index 0728faf..db3cf01 100644 --- a/itk/clitkVectorBSplineResampleImageFunctionWithLUT.h +++ b/itk/clitkVectorBSplineResampleImageFunctionWithLUT.h @@ -43,13 +43,13 @@ namespace clitk template class ITK_EXPORT VectorBSplineResampleImageFunctionWithLUT : public VectorBSplineInterpolateImageFunctionWithLUT< - TImageType,TCoordRep,ITK_TYPENAME TImageType::PixelType::ValueType > + TImageType,TCoordRep,typename TImageType::PixelType::ValueType > { public: /** Standard class typedefs. */ typedef VectorBSplineResampleImageFunctionWithLUT Self; typedef VectorBSplineInterpolateImageFunctionWithLUT< - TImageType,TCoordRep, ITK_TYPENAME TImageType::PixelType::ValueType > Superclass; + TImageType,TCoordRep, typename TImageType::PixelType::ValueType > Superclass; typedef itk::SmartPointer Pointer; typedef itk::SmartPointer ConstPointer; diff --git a/itk/itkBSplineResampleImageFunctionWithLUT.h b/itk/itkBSplineResampleImageFunctionWithLUT.h index 3149db5..23ec5c4 100644 --- a/itk/itkBSplineResampleImageFunctionWithLUT.h +++ b/itk/itkBSplineResampleImageFunctionWithLUT.h @@ -43,13 +43,13 @@ namespace itk template class ITK_EXPORT BSplineResampleImageFunctionWithLUT : public BSplineInterpolateImageFunctionWithLUT< - TImageType,TCoordRep,ITK_TYPENAME TImageType::PixelType > + TImageType,TCoordRep,typename TImageType::PixelType > { public: /** Standard class typedefs. */ typedef BSplineResampleImageFunctionWithLUT Self; typedef BSplineInterpolateImageFunctionWithLUT< - TImageType,TCoordRep, ITK_TYPENAME TImageType::PixelType > Superclass; + TImageType,TCoordRep, typename TImageType::PixelType > Superclass; typedef SmartPointer Pointer; typedef SmartPointer ConstPointer; diff --git a/registration/clitkCorrelationRatioImageToImageMetric.txx b/registration/clitkCorrelationRatioImageToImageMetric.txx index aac2a78..a400e51 100644 --- a/registration/clitkCorrelationRatioImageToImageMetric.txx +++ b/registration/clitkCorrelationRatioImageToImageMetric.txx @@ -227,7 +227,7 @@ CorrelationRatioImageToImageMetric FixedImageType> FixedIteratorType; typedef itk::ImageRegionConstIteratorWithIndex< - ITK_TYPENAME Superclass::GradientImageType> GradientIteratorType; + typename Superclass::GradientImageType> GradientIteratorType; FixedIteratorType ti( fixedImage, this->GetFixedImageRegion() ); @@ -240,7 +240,7 @@ CorrelationRatioImageToImageMetric const unsigned int ParametersDimension = this->GetNumberOfParameters(); derivative = DerivativeType( ParametersDimension ); - derivative.Fill( itk::NumericTraits::Zero ); + derivative.Fill( itk::NumericTraits::Zero ); ti.GoToBegin(); @@ -348,7 +348,7 @@ CorrelationRatioImageToImageMetric FixedImageType> FixedIteratorType; typedef itk::ImageRegionConstIteratorWithIndex< - ITK_TYPENAME Superclass::GradientImageType> GradientIteratorType; + typename Superclass::GradientImageType> GradientIteratorType; FixedIteratorType ti( fixedImage, this->GetFixedImageRegion() ); @@ -363,7 +363,7 @@ CorrelationRatioImageToImageMetric const unsigned int ParametersDimension = this->GetNumberOfParameters(); derivative = DerivativeType( ParametersDimension ); - derivative.Fill( NumericTraits::Zero ); + derivative.Fill( NumericTraits::Zero ); ti.GoToBegin(); diff --git a/registration/clitkNormalizedCorrelationImageToImageMetric.txx b/registration/clitkNormalizedCorrelationImageToImageMetric.txx index 342549e..d87bd0b 100644 --- a/registration/clitkNormalizedCorrelationImageToImageMetric.txx +++ b/registration/clitkNormalizedCorrelationImageToImageMetric.txx @@ -181,13 +181,13 @@ NormalizedCorrelationImageToImageMetric const unsigned int ParametersDimension = this->GetNumberOfParameters(); derivative = DerivativeType( ParametersDimension ); - derivative.Fill( itk::NumericTraits::Zero ); + derivative.Fill( itk::NumericTraits::Zero ); DerivativeType derivativeF = DerivativeType( ParametersDimension ); - derivativeF.Fill( itk::NumericTraits::Zero ); + derivativeF.Fill( itk::NumericTraits::Zero ); DerivativeType derivativeM = DerivativeType( ParametersDimension ); - derivativeM.Fill( itk::NumericTraits::Zero ); + derivativeM.Fill( itk::NumericTraits::Zero ); ti.GoToBegin(); // First compute the sums @@ -358,16 +358,16 @@ NormalizedCorrelationImageToImageMetric const unsigned int ParametersDimension = this->GetNumberOfParameters(); derivative = DerivativeType( ParametersDimension ); - derivative.Fill( itk::NumericTraits::Zero ); + derivative.Fill( itk::NumericTraits::Zero ); DerivativeType derivativeF = DerivativeType( ParametersDimension ); - derivativeF.Fill( itk::NumericTraits::Zero ); + derivativeF.Fill( itk::NumericTraits::Zero ); DerivativeType derivativeM = DerivativeType( ParametersDimension ); - derivativeM.Fill( itk::NumericTraits::Zero ); + derivativeM.Fill( itk::NumericTraits::Zero ); DerivativeType derivativeM1 = DerivativeType( ParametersDimension ); - derivativeM1.Fill( itk::NumericTraits::Zero ); + derivativeM1.Fill( itk::NumericTraits::Zero ); ti.GoToBegin(); // First compute the sums diff --git a/registration/clitkNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx b/registration/clitkNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx index 7290bd4..8aa553f 100644 --- a/registration/clitkNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx +++ b/registration/clitkNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx @@ -181,13 +181,13 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD const unsigned int ParametersDimension = this->GetNumberOfParameters(); derivative = DerivativeType( ParametersDimension ); - derivative.Fill( itk::NumericTraits::Zero ); + derivative.Fill( itk::NumericTraits::Zero ); DerivativeType derivativeF = DerivativeType( ParametersDimension ); - derivativeF.Fill( itk::NumericTraits::Zero ); + derivativeF.Fill( itk::NumericTraits::Zero ); DerivativeType derivativeM = DerivativeType( ParametersDimension ); - derivativeM.Fill( itk::NumericTraits::Zero ); + derivativeM.Fill( itk::NumericTraits::Zero ); ti.GoToBegin(); // First compute the sums @@ -358,16 +358,16 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD const unsigned int ParametersDimension = this->GetNumberOfParameters(); derivative = DerivativeType( ParametersDimension ); - derivative.Fill( itk::NumericTraits::Zero ); + derivative.Fill( itk::NumericTraits::Zero ); DerivativeType derivativeF = DerivativeType( ParametersDimension ); - derivativeF.Fill( itk::NumericTraits::Zero ); + derivativeF.Fill( itk::NumericTraits::Zero ); DerivativeType derivativeM = DerivativeType( ParametersDimension ); - derivativeM.Fill( itk::NumericTraits::Zero ); + derivativeM.Fill( itk::NumericTraits::Zero ); DerivativeType derivativeM1 = DerivativeType( ParametersDimension ); - derivativeM1.Fill( itk::NumericTraits::Zero ); + derivativeM1.Fill( itk::NumericTraits::Zero ); ti.GoToBegin(); // First compute the sums diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx index d20a0e9..ea5d9a5 100644 --- a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx +++ b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx @@ -433,16 +433,16 @@ NormalizedCorrelationImageToImageMetric } memset( derivative.data_block(), 0, - this->m_NumberOfParameters * sizeof(ITK_TYPENAME DerivativeType::ValueType) ); + this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) ); for( unsigned int threadID = 0; threadIDm_NumberOfThreads; threadID++ ) { memset( m_ThreaderDerivativeF[threadID].data_block(), 0, - this->m_NumberOfParameters * sizeof(ITK_TYPENAME DerivativeType::ValueType) ); + this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) ); memset( m_ThreaderDerivativeM[threadID].data_block(), 0, - this->m_NumberOfParameters * sizeof(ITK_TYPENAME DerivativeType::ValueType) ); + this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) ); } // MUST BE CALLED TO INITIATE PROCESSING diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx index 0ee3e6e..de0366e 100644 --- a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx +++ b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx @@ -457,16 +457,16 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD } memset( derivative.data_block(), 0, - this->m_NumberOfParameters * sizeof(ITK_TYPENAME DerivativeType::ValueType) ); + this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) ); for( unsigned int threadID = 0; threadIDm_NumberOfThreads; threadID++ ) { memset( m_ThreaderDerivativeF[threadID].data_block(), 0, - this->m_NumberOfParameters * sizeof(ITK_TYPENAME DerivativeType::ValueType) ); + this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) ); memset( m_ThreaderDerivativeM[threadID].data_block(), 0, - this->m_NumberOfParameters * sizeof(ITK_TYPENAME DerivativeType::ValueType) ); + this->m_NumberOfParameters * sizeof(typename DerivativeType::ValueType) ); } // MUST BE CALLED TO INITIATE PROCESSING diff --git a/registration/itkMeanSquaresImageToImageMetricFor3DBLUTFFD.txx b/registration/itkMeanSquaresImageToImageMetricFor3DBLUTFFD.txx index ec4b7ba..89343e9 100644 --- a/registration/itkMeanSquaresImageToImageMetricFor3DBLUTFFD.txx +++ b/registration/itkMeanSquaresImageToImageMetricFor3DBLUTFFD.txx @@ -171,7 +171,7 @@ MeanSquaresImageToImageMetricFor3DBLUTFFD const unsigned int ParametersDimension = this->GetNumberOfParameters(); derivative = DerivativeType( ParametersDimension ); - derivative.Fill( NumericTraits::Zero ); + derivative.Fill( NumericTraits::Zero ); ti.GoToBegin(); @@ -289,7 +289,7 @@ MeanSquaresImageToImageMetricFor3DBLUTFFD const unsigned int ParametersDimension = this->GetNumberOfParameters(); derivative = DerivativeType( ParametersDimension ); - derivative.Fill( NumericTraits::Zero ); + derivative.Fill( NumericTraits::Zero ); ti.GoToBegin(); -- 2.47.1