Merge branch 'master' of /home/dsarrut/clitk3.server

diff --git a/itk/clitkVectorBSplineResampleImageFunction.h b/itk/clitkVectorBSplineResampleImageFunction.h
index 866839224fc468a427a3b6cb46cb136170c038a7..96a51cb37845d7ffff4aa67e539bba46de100e31 100644 (file)
--- a/itk/clitkVectorBSplineResampleImageFunction.h
+++ b/itk/clitkVectorBSplineResampleImageFunction.h
@@ -43,12 +43,12 @@ namespace clitk
 template <class TImageType, class TCoordRep = float>
 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<TImageType,TCoordRep, ITK_TYPENAME TImageType::PixelType::ValueType >  Superclass;
+  typedef VectorBSplineInterpolateImageFunction<TImageType,TCoordRep, typename TImageType::PixelType::ValueType >  Superclass;
   typedef itk::SmartPointer<Self>                                    Pointer;
   typedef itk::SmartPointer<const Self>                              ConstPointer;
 

diff --git a/itk/clitkVectorBSplineResampleImageFunctionWithLUT.h b/itk/clitkVectorBSplineResampleImageFunctionWithLUT.h
index 0728faf0cee1867ac3916c68df9e1ab013cb3b91..db3cf01eee626e3a12cc743770ebbf496e5fa7cd 100644 (file)
--- a/itk/clitkVectorBSplineResampleImageFunctionWithLUT.h
+++ b/itk/clitkVectorBSplineResampleImageFunctionWithLUT.h
@@ -43,13 +43,13 @@ namespace clitk
 template <class TImageType, class TCoordRep = float>
 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<Self>                    Pointer;
   typedef itk::SmartPointer<const Self>              ConstPointer;
 

diff --git a/itk/itkBSplineResampleImageFunctionWithLUT.h b/itk/itkBSplineResampleImageFunctionWithLUT.h
index 3149db535954cd129c6439b0ded9d4fda893bf2f..23ec5c4bf30653966903420ad702cb3acfc258b5 100644 (file)
--- a/itk/itkBSplineResampleImageFunctionWithLUT.h
+++ b/itk/itkBSplineResampleImageFunctionWithLUT.h
@@ -43,13 +43,13 @@ namespace itk
 template <class TImageType, class TCoordRep = float>
 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<Self>                                    Pointer;
   typedef SmartPointer<const Self>                              ConstPointer;
 

diff --git a/registration/clitkBSplineDeformableTransform.h b/registration/clitkBSplineDeformableTransform.h
index bab7f8c78257206b4d060b557211235d89b2217d..f5b269828fffb20b5759ae061d8390e3f8698908 100644 (file)
--- a/registration/clitkBSplineDeformableTransform.h
+++ b/registration/clitkBSplineDeformableTransform.h
@@ -65,6 +65,9 @@ namespace clitk
 
     /** Standard parameters container. */
     typedef typename Superclass::ParametersType ParametersType;
+#if ITK_VERSION_MAJOR >= 4
+    typedef typename Superclass::NumberOfParametersType NumberOfParametersType;
+#endif
 
     /** Standard Jacobian container. */
     typedef typename Superclass::JacobianType JacobianType;
@@ -265,7 +268,11 @@ namespace clitk
 #endif
 
     /** Return the number of parameters that completely define the Transfom */
+#if ITK_VERSION_MAJOR >= 4
+    virtual NumberOfParametersType GetNumberOfParameters(void) const;
+#else
     virtual unsigned int GetNumberOfParameters(void) const;
+#endif
 
     /** Return the number of parameters per dimension */
     unsigned int GetNumberOfParametersPerDimension(void) const;

diff --git a/registration/clitkBSplineDeformableTransform.txx b/registration/clitkBSplineDeformableTransform.txx
index 1a2dfd3ccab98b4e60deef7e064edf18de99a474..9d7cc6b8e2427d195544854ce540d75390a0789b 100644 (file)
--- a/registration/clitkBSplineDeformableTransform.txx
+++ b/registration/clitkBSplineDeformableTransform.txx
@@ -255,7 +255,11 @@ namespace clitk
 
   // Get the number of parameters
   template<class TCoordRep, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+#if ITK_VERSION_MAJOR >= 4
+  typename BSplineDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>::NumberOfParametersType
+#else
   unsigned int
+#endif
   BSplineDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>
   ::GetNumberOfParameters(void) const
   {

diff --git a/registration/clitkCorrelationRatioImageToImageMetric.txx b/registration/clitkCorrelationRatioImageToImageMetric.txx
index aac2a786560e270580faafdee5155b488b327fde..a400e5100c0819fb46bc8c9bd20f93fdbe35666b 100644 (file)
--- a/registration/clitkCorrelationRatioImageToImageMetric.txx
+++ b/registration/clitkCorrelationRatioImageToImageMetric.txx
@@ -227,7 +227,7 @@ CorrelationRatioImageToImageMetric<TFixedImage,TMovingImage>
   FixedImageType> FixedIteratorType;
 
   typedef  itk::ImageRegionConstIteratorWithIndex<
-  ITK_TYPENAME Superclass::GradientImageType> GradientIteratorType;
+  typename Superclass::GradientImageType> GradientIteratorType;
 
 
   FixedIteratorType ti( fixedImage, this->GetFixedImageRegion() );
@@ -240,7 +240,7 @@ CorrelationRatioImageToImageMetric<TFixedImage,TMovingImage>
 
   const unsigned int ParametersDimension = this->GetNumberOfParameters();
   derivative = DerivativeType( ParametersDimension );
-  derivative.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivative.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   ti.GoToBegin();
 
@@ -348,7 +348,7 @@ CorrelationRatioImageToImageMetric<TFixedImage,TMovingImage>
   FixedImageType> FixedIteratorType;
 
   typedef  itk::ImageRegionConstIteratorWithIndex<
-  ITK_TYPENAME Superclass::GradientImageType> GradientIteratorType;
+  typename Superclass::GradientImageType> GradientIteratorType;
 
 
   FixedIteratorType ti( fixedImage, this->GetFixedImageRegion() );
@@ -363,7 +363,7 @@ CorrelationRatioImageToImageMetric<TFixedImage,TMovingImage>
 
   const unsigned int ParametersDimension = this->GetNumberOfParameters();
   derivative = DerivativeType( ParametersDimension );
-  derivative.Fill( NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivative.Fill( NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   ti.GoToBegin();
 

diff --git a/registration/clitkMultipleBSplineDeformableTransform.h b/registration/clitkMultipleBSplineDeformableTransform.h
index 84e8f7494b4918dfcf465f961c830bf82c56a9fc..5b2ee9eb35686933603bb10b4f22796e1be100b7 100644 (file)
--- a/registration/clitkMultipleBSplineDeformableTransform.h
+++ b/registration/clitkMultipleBSplineDeformableTransform.h
@@ -59,6 +59,9 @@ namespace clitk
 
     /** Standard parameters container. */
     typedef typename Superclass::ParametersType ParametersType;
+#if ITK_VERSION_MAJOR >= 4
+    typedef typename Superclass::NumberOfParametersType NumberOfParametersType;
+#endif
 
     /** Standard Jacobian container. */
     typedef typename Superclass::JacobianType JacobianType;
@@ -224,7 +227,11 @@ namespace clitk
 #endif
 
     /** Return the number of parameters that completely define the Transfom */
+#if ITK_VERSION_MAJOR >= 4
+    virtual NumberOfParametersType GetNumberOfParameters(void) const;
+#else
     virtual unsigned int GetNumberOfParameters(void) const;
+#endif
 
     /** Return the number of parameters per dimension */
     unsigned int GetNumberOfParametersPerDimension(void) const;

diff --git a/registration/clitkMultipleBSplineDeformableTransform.txx b/registration/clitkMultipleBSplineDeformableTransform.txx
index 32ebced48447e08923ce6baefec63dbdb4253716..8df270661409bf8c8ed4939fa34c017db445f0f7 100644 (file)
--- a/registration/clitkMultipleBSplineDeformableTransform.txx
+++ b/registration/clitkMultipleBSplineDeformableTransform.txx
@@ -329,7 +329,11 @@ namespace clitk
 #undef LOOP_ON_LABELS
 
   template<class TCoordRep, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+#if ITK_VERSION_MAJOR >= 4
+  inline typename MultipleBSplineDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>::NumberOfParametersType
+#else
   inline unsigned int
+#endif
   MultipleBSplineDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>
   ::GetNumberOfParameters(void) const
   {

diff --git a/registration/clitkNormalizedCorrelationImageToImageMetric.txx b/registration/clitkNormalizedCorrelationImageToImageMetric.txx
index 342549ee72ea276bc0cde8610221b6052cf2d768..d87bd0bed08b28adb8f69bd5595e1b5490c8f183 100644 (file)
--- a/registration/clitkNormalizedCorrelationImageToImageMetric.txx
+++ b/registration/clitkNormalizedCorrelationImageToImageMetric.txx
@@ -181,13 +181,13 @@ NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
 
   const unsigned int ParametersDimension = this->GetNumberOfParameters();
   derivative = DerivativeType( ParametersDimension );
-  derivative.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivative.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   DerivativeType derivativeF = DerivativeType( ParametersDimension );
-  derivativeF.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivativeF.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   DerivativeType derivativeM = DerivativeType( ParametersDimension );
-  derivativeM.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivativeM.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   ti.GoToBegin();
   // First compute the sums
@@ -358,16 +358,16 @@ NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
 
   const unsigned int ParametersDimension = this->GetNumberOfParameters();
   derivative = DerivativeType( ParametersDimension );
-  derivative.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivative.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   DerivativeType derivativeF = DerivativeType( ParametersDimension );
-  derivativeF.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivativeF.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   DerivativeType derivativeM = DerivativeType( ParametersDimension );
-  derivativeM.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivativeM.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   DerivativeType derivativeM1 = DerivativeType( ParametersDimension );
-  derivativeM1.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivativeM1.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   ti.GoToBegin();
   // First compute the sums

diff --git a/registration/clitkNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx b/registration/clitkNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx
index 7290bd49fb1fb2cd3c701e12a7db24815503573b..8aa553fd2bf14aca714bd29ecb56b1a502e1d00d 100644 (file)
--- a/registration/clitkNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/clitkNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx
@@ -181,13 +181,13 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 
   const unsigned int ParametersDimension = this->GetNumberOfParameters();
   derivative = DerivativeType( ParametersDimension );
-  derivative.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivative.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   DerivativeType derivativeF = DerivativeType( ParametersDimension );
-  derivativeF.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivativeF.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   DerivativeType derivativeM = DerivativeType( ParametersDimension );
-  derivativeM.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivativeM.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   ti.GoToBegin();
   // First compute the sums
@@ -358,16 +358,16 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 
   const unsigned int ParametersDimension = this->GetNumberOfParameters();
   derivative = DerivativeType( ParametersDimension );
-  derivative.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivative.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   DerivativeType derivativeF = DerivativeType( ParametersDimension );
-  derivativeF.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivativeF.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   DerivativeType derivativeM = DerivativeType( ParametersDimension );
-  derivativeM.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivativeM.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   DerivativeType derivativeM1 = DerivativeType( ParametersDimension );
-  derivativeM1.Fill( itk::NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivativeM1.Fill( itk::NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   ti.GoToBegin();
   // First compute the sums

diff --git a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx
index d20a0e9c4b3265457e37e3d9c44889b28d4eeb4e..ea5d9a5d048dfb88824865a53700ef3f8a6e39a0 100644 (file)
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetric.txx
@@ -433,16 +433,16 @@ NormalizedCorrelationImageToImageMetric<TFixedImage,TMovingImage>
   }
   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; threadID<this->m_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 0ee3e6ef635a287086b9f4d9386e535c45eff332..de0366e1d998baadc051fafa9d89051dec7f1947 100644 (file)
--- a/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/clitkOptNormalizedCorrelationImageToImageMetricFor3DBLUTFFD.txx
@@ -457,16 +457,16 @@ NormalizedCorrelationImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
   }
   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; threadID<this->m_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/clitkShapedBLUTSpatioTemporalDeformableTransform.h b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
index f3071b136c39433e2738063a646b268eadb5bc56..c9fb588e30f83641260459a16e9d57e0cd684a66 100644 (file)
--- a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
+++ b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.h
@@ -68,6 +68,9 @@ namespace clitk
 
     /** Standard parameters container. */
     typedef typename Superclass::ParametersType ParametersType;
+#if ITK_VERSION_MAJOR >= 4
+    typedef typename Superclass::NumberOfParametersType NumberOfParametersType;
+#endif
 
     /** Standard Jacobian container. */
     typedef typename Superclass::JacobianType JacobianType;
@@ -274,7 +277,11 @@ namespace clitk
 #endif
 
     /** Return the number of parameters that completely define the Transfom */
+#if ITK_VERSION_MAJOR >= 4
+    virtual NumberOfParametersType GetNumberOfParameters(void) const;
+#else
     virtual unsigned int GetNumberOfParameters(void) const;
+#endif
 
     //JV Return the padded number of parameters
     virtual unsigned int GetPaddedNumberOfParameters(void) const;

diff --git a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx
index cebdb5bae492ec753a7e0e247bf9cf52aa70777b..ea10c73d98757135a3408601e4d26f9fae9a2f05 100644 (file)
--- a/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx
+++ b/registration/clitkShapedBLUTSpatioTemporalDeformableTransform.txx
@@ -383,7 +383,11 @@ namespace clitk
 
   // Get the number of parameters
   template<class TCoordRep, unsigned int NInputDimensions, unsigned int NOutputDimensions>
+#if ITK_VERSION_MAJOR >= 4
+  typename ShapedBLUTSpatioTemporalDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>::NumberOfParametersType
+#else
   unsigned int
+#endif
   ShapedBLUTSpatioTemporalDeformableTransform<TCoordRep, NInputDimensions, NOutputDimensions>
   ::GetNumberOfParameters(void) const
   {

diff --git a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
index a31fe349856f97799509af9fe6ce4e328012d5d1..091e36cb57f5eac7a56e58a381475806e97a88e2 100644 (file)
--- a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
+++ b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.h
@@ -52,11 +52,7 @@
 #include "itkBSplineDerivativeKernelFunction.h"
 #include "itkCentralDifferenceImageFunction.h"
 #include "itkBSplineInterpolateImageFunction.h"
-#if ITK_VERSION_MAJOR >= 4
-  #include "itkBSplineTransform.h"
-#else
-  #include "itkBSplineDeformableTransform.h"
-#endif
+#include "itkBSplineDeformableTransform.h"
 #include "itkArray2D.h"
 
 namespace itk
@@ -475,17 +471,10 @@ private:
   /**
    * Typedefs for the BSplineDeformableTransform.
    */
-#if ITK_VERSION_MAJOR >= 4
-  typedef BSplineTransform<
-  CoordinateRepresentationType,
-  ::itk::GetImageDimension<FixedImageType>::ImageDimension,
-  DeformationSplineOrder> BSplineTransformType;
-#else
   typedef BSplineDeformableTransform<
   CoordinateRepresentationType,
   ::itk::GetImageDimension<FixedImageType>::ImageDimension,
   DeformationSplineOrder> BSplineTransformType;
-#endif
   typedef typename BSplineTransformType::WeightsType
   BSplineTransformWeightsType;
   typedef typename BSplineTransformType::ParameterIndexArrayType

diff --git a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
index 1b38cae012c10569ca6d8add8bcf8ab490d6fb0c..7e50dc9cdd7a452ca3dc6f5d148668362d202bc6 100644 (file)
--- a/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/itkMattesMutualInformationImageToImageMetricFor3DBLUTFFD.txx
@@ -54,11 +54,7 @@
 #include "itkImageRegionIterator.h"
 #include "itkImageIterator.h"
 #include "vnl/vnl_math.h"
-#if ITK_VERSION_MAJOR >= 4
-  #include "itkBSplineTransform.h"
-#else
-  #include "itkBSplineDeformableTransform.h"
-#endif
+#include "itkBSplineDeformableTransform.h"
 
 namespace itk
 {

diff --git a/registration/itkMeanSquaresImageToImageMetricFor3DBLUTFFD.txx b/registration/itkMeanSquaresImageToImageMetricFor3DBLUTFFD.txx
index ec4b7ba6ed9c738edd3c15cdb4912311e2e32a79..89343e922e86b9f3940bb0be4a91fe9152cc698f 100644 (file)
--- a/registration/itkMeanSquaresImageToImageMetricFor3DBLUTFFD.txx
+++ b/registration/itkMeanSquaresImageToImageMetricFor3DBLUTFFD.txx
@@ -171,7 +171,7 @@ MeanSquaresImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 
   const unsigned int ParametersDimension = this->GetNumberOfParameters();
   derivative = DerivativeType( ParametersDimension );
-  derivative.Fill( NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivative.Fill( NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   ti.GoToBegin();
 
@@ -289,7 +289,7 @@ MeanSquaresImageToImageMetricFor3DBLUTFFD<TFixedImage,TMovingImage>
 
   const unsigned int ParametersDimension = this->GetNumberOfParameters();
   derivative = DerivativeType( ParametersDimension );
-  derivative.Fill( NumericTraits<ITK_TYPENAME DerivativeType::ValueType>::Zero );
+  derivative.Fill( NumericTraits<typename DerivativeType::ValueType>::Zero );
 
   ti.GoToBegin();
 

diff --git a/segmentation/CMakeLists.txt b/segmentation/CMakeLists.txt
index 0275336dea4a760edb663513ff8bef732858cd46..d6812e0438f5d2482fded241aeff5dda4283fcd8 100644 (file)
--- a/segmentation/CMakeLists.txt
+++ b/segmentation/CMakeLists.txt
@@ -25,95 +25,95 @@ IF(CLITK_BUILD_SEGMENTATION)
     WRAP_GGO(clitkFillMask_GGO_C clitkFillMask.ggo)
     ADD_EXECUTABLE(clitkFillMask clitkFillMask.cxx ${clitkFillMask_GGO_C})
     TARGET_LINK_LIBRARIES(clitkFillMask clitkCommon ${ITK_LIBRARIES})
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkFillMask)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkFillMask)
 
     ADD_EXECUTABLE(clitkExtractPatient clitkExtractPatient.cxx ${clitkExtractPatient_GGO_C})
     TARGET_LINK_LIBRARIES(clitkExtractPatient clitkCommon ${ITK_LIBRARIES} clitkSegmentationGgoLib)
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkExtractPatient)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkExtractPatient)
 
     ADD_EXECUTABLE(clitkExtractLung clitkExtractLung.cxx  ${clitkExtractLung_GGO_C})
     TARGET_LINK_LIBRARIES(clitkExtractLung clitkSegmentationGgoLib clitkCommon ${ITK_LIBRARIES})
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkExtractLung)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkExtractLung)
 
     # WRAP_GGO(clitkExtractAirwaysTreeInfo_GGO_C clitkExtractAirwaysTreeInfo.ggo)
     # ADD_EXECUTABLE(clitkExtractAirwaysTreeInfo clitkExtractAirwaysTreeInfo.cxx ${clitkExtractAirwaysTreeInfo_GGO_C})
     # TARGET_LINK_LIBRARIES(clitkExtractAirwaysTreeInfo clitkSegmentationGgoLib clitkCommon ${ITK_LIBRARIES})
-    # SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkExtractAirwaysTreeInfo)
+    # SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkExtractAirwaysTreeInfo)
 
     WRAP_GGO(clitkExtractBones_GGO_C clitkExtractBones.ggo)
     ADD_EXECUTABLE(clitkExtractBones clitkExtractBones.cxx ${clitkExtractBones_GGO_C})
     TARGET_LINK_LIBRARIES(clitkExtractBones clitkCommon ${ITK_LIBRARIES} clitkSegmentationGgoLib)
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkExtractBones)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkExtractBones)
 
     WRAP_GGO(clitkBool_GGO_C clitkBool.ggo)
     ADD_EXECUTABLE(clitkBool clitkBool.cxx ${clitkBool_GGO_C})
     TARGET_LINK_LIBRARIES(clitkBool clitkCommon ${ITK_LIBRARIES} clitkSegmentationGgoLib)
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkBool)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkBool)
 
     WRAP_GGO(clitkExtractMediastinum_GGO_C clitkExtractMediastinum.ggo)
     ADD_EXECUTABLE(clitkExtractMediastinum clitkExtractMediastinum.cxx ${clitkExtractMediastinum_GGO_C})
     TARGET_LINK_LIBRARIES(clitkExtractMediastinum clitkCommon clitkSegmentationGgoLib ${ITK_LIBRARIES})
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkExtractMediastinum)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkExtractMediastinum)
 
     WRAP_GGO(clitkExtractLymphStations_GGO_C clitkExtractLymphStations.ggo)
     ADD_EXECUTABLE(clitkExtractLymphStations clitkExtractLymphStations.cxx clitkFilterWithAnatomicalFeatureDatabaseManagement.cxx ${clitkExtractLymphStations_GGO_C})
     TARGET_LINK_LIBRARIES(clitkExtractLymphStations clitkSegmentationGgoLib clitkCommon vtkHybrid)
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkExtractLymphStations)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkExtractLymphStations)
 
     WRAP_GGO(clitkExtractMediastinalVessels_GGO_C clitkExtractMediastinalVessels.ggo)
     ADD_EXECUTABLE(clitkExtractMediastinalVessels clitkExtractMediastinalVessels.cxx clitkFilterWithAnatomicalFeatureDatabaseManagement.cxx ${clitkExtractMediastinalVessels_GGO_C})
     TARGET_LINK_LIBRARIES(clitkExtractMediastinalVessels clitkSegmentationGgoLib clitkCommon vtkHybrid)
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkExtractMediastinalVessels)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkExtractMediastinalVessels)
 
     WRAP_GGO(clitkMorphoMath_GGO_C clitkMorphoMath.ggo)
     ADD_EXECUTABLE(clitkMorphoMath clitkMorphoMath.cxx ${clitkMorphoMath_GGO_C})
     TARGET_LINK_LIBRARIES(clitkMorphoMath clitkCommon ${ITK_LIBRARIES})
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkMorphoMath)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkMorphoMath)
 
     WRAP_GGO(clitkMorphoReconstruction_GGO_C clitkMorphoReconstruction.ggo)
     ADD_EXECUTABLE(clitkMorphoReconstruction clitkMorphoReconstruction.cxx clitkMorphoReconstructionGenericFilter.cxx ${clitkMorphoReconstruction_GGO_C})
     TARGET_LINK_LIBRARIES(clitkMorphoReconstruction clitkSegmentationGgoLib clitkCommon ${ITK_LIBRARIES})
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkMorphoReconstruction)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkMorphoReconstruction)
 
     WRAP_GGO(clitkCalculateDistanceMap_GGO_C clitkCalculateDistanceMap.ggo)
     ADD_EXECUTABLE(clitkCalculateDistanceMap clitkCalculateDistanceMap.cxx clitkCalculateDistanceMapGenericFilter.cxx ${clitkCalculateDistanceMap_GGO_C})
     TARGET_LINK_LIBRARIES(clitkCalculateDistanceMap clitkCommon ${ITK_LIBRARIES})
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkCalculateDistanceMap)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkCalculateDistanceMap)
 
     WRAP_GGO(clitkLevelSetSegmentation_GGO_C clitkLevelSetSegmentation.ggo)
     ADD_EXECUTABLE(clitkLevelSetSegmentation clitkLevelSetSegmentation.cxx clitkLevelSetSegmentationGenericFilter.cxx ${clitkLevelSetSegmentation_GGO_C})
     TARGET_LINK_LIBRARIES(clitkLevelSetSegmentation clitkCommon ${ITK_LIBRARIES})
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkLevelSetSegmentation)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkLevelSetSegmentation)
 
     WRAP_GGO(clitkAnd_GGO_C clitkAnd.ggo)
     ADD_EXECUTABLE(clitkAnd clitkAnd.cxx clitkAndGenericFilter.cxx ${clitkAnd_GGO_C})
     TARGET_LINK_LIBRARIES(clitkAnd clitkCommon ${ITK_LIBRARIES} )
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkAnd)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkAnd)
 
     WRAP_GGO(clitkRegionGrowing_GGO_C clitkRegionGrowing.ggo)
     ADD_EXECUTABLE(clitkRegionGrowing clitkRegionGrowing.cxx clitkRegionGrowingGenericFilter.cxx ${clitkRegionGrowing_GGO_C})
     TARGET_LINK_LIBRARIES(clitkRegionGrowing clitkCommon ${ITK_LIBRARIES})
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkRegionGrowing)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkRegionGrowing)
 
     WRAP_GGO(clitkDecomposeAndReconstruct_GGO_C clitkDecomposeAndReconstruct.ggo)
     ADD_EXECUTABLE(clitkDecomposeAndReconstruct clitkDecomposeAndReconstruct.cxx clitkDecomposeAndReconstructGenericFilter.cxx ${clitkDecomposeAndReconstruct_GGO_C})
     TARGET_LINK_LIBRARIES(clitkDecomposeAndReconstruct clitkCommon ${ITK_LIBRARIES})
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkDecomposeAndReconstruct)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkDecomposeAndReconstruct)
 
     WRAP_GGO(clitkMotionMask_GGO_C clitkMotionMask.ggo)
     ADD_EXECUTABLE(clitkMotionMask clitkMotionMask.cxx clitkMotionMaskGenericFilter.cxx ${clitkMotionMask_GGO_C})
     TARGET_LINK_LIBRARIES(clitkMotionMask clitkCommon ${ITK_LIBRARIES})
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkMotionMask)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkMotionMask)
 
     WRAP_GGO(clitkFillImageRegion_GGO_C clitkFillImageRegion.ggo)
     ADD_EXECUTABLE(clitkFillImageRegion clitkFillImageRegion.cxx clitkFillImageRegionGenericFilter.cxx ${clitkFillImageRegion_GGO_C})
     TARGET_LINK_LIBRARIES(clitkFillImageRegion clitkCommon ${ITK_LIBRARIES})
-    SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkFillImageRegion)
+    SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkFillImageRegion)
 
     # WRAP_GGO(clitkTestFilter_GGO_C clitkTestFilter.ggo)
     # ADD_EXECUTABLE(clitkTestFilter clitkTestFilter.cxx ${clitkTestFilter_GGO_C})
     # TARGET_LINK_LIBRARIES(clitkTestFilter clitkSegmentationGgoLib clitkCommon vtkHybrid)
-    # SET(SEGMENTATION_INSTALL ${TOOLS_INSTALL} clitkTestFilter)
+    # SET(SEGMENTATION_INSTALL ${SEGMENTATION_INSTALL} clitkTestFilter)
     
     SET_TARGET_PROPERTIES(${SEGMENTATION_INSTALL} PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" )  
     INSTALL (TARGETS ${SEGMENTATION_INSTALL} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)

diff --git a/tools/clitkJacobianImageGenericFilter.txx b/tools/clitkJacobianImageGenericFilter.txx
index 21894110909197fa3d1e335284beba6aa53da184..3a4adcf12ae0df4f66d0ca082871995961708d14 100644 (file)
--- a/tools/clitkJacobianImageGenericFilter.txx
+++ b/tools/clitkJacobianImageGenericFilter.txx
@@ -28,7 +28,7 @@
  ===================================================*/
 
 #include "clitkImageCommon.h"
-#include "itkDeformationFieldJacobianDeterminantFilter.h"
+#include "itkDisplacementFieldJacobianDeterminantFilter.h"
 #include "itkImage.h"
 #include "itkImageFileReader.h"
 #include "itkImageFileWriter.h"
@@ -126,7 +126,6 @@ JacobianImageGenericFilter<args_info_type>::UpdateWithDimAndPixelType()
   
   typedef double OutputPixelType;
   typedef itk::Image<OutputPixelType, dim> ImageType;
-  //typedef itk::DeformationFieldJacobianDeterminantFilter<VectorFieldType, PixelType, ImageType> JacobianFilterType;
   typedef itk::DisplacementFieldJacobianDeterminantFilter<VectorFieldType, OutputPixelType, ImageType> JacobianFilterType;
 
   typename VectorFieldType::Pointer vfield = vfield_reader->GetOutput();

diff --git a/vv/vv.cxx b/vv/vv.cxx
index 981105095d68a80934280b6e332895cc1d42fa9a..301521b4662a8509197d81174b348964b4e5e140 100644 (file)
--- a/vv/vv.cxx
+++ b/vv/vv.cxx
@@ -196,10 +196,13 @@ int main( int argc, char** argv )
     window.ApplyWindowLevelToAllImages();
   }
 
+
+  int ret = app.exec();
+  
 #ifndef _WIN32
   // restoring the locale, just to be clean...
   setlocale(LC_NUMERIC, old_locale.c_str());
 #endif
 
-  return app.exec();
+  return ret;
 }

diff --git a/vv/vvInit.cxx b/vv/vvInit.cxx
deleted file mode 100644 (file)
index 50d5036..0000000
--- a/vv/vvInit.cxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*=========================================================================
-  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
-
-  Authors belong to:
-  - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://www.centreleonberard.fr
-  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
-
-  This software is distributed WITHOUT ANY WARRANTY; without even
-  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the copyright notices for more information.
-
-  It is distributed under dual licence
-
-  - BSD        See included LICENSE.txt file
-  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-===========================================================================**/
-#include "nkitkXDRImageIO.h"
-#include "nkitkXDRImageIOFactory.h"
-#include "clitkVoxImageIO.h"
-#include "clitkVoxImageIOFactory.h"
-#include "clitkVfImageIO.h"
-#include "clitkVfImageIOFactory.h"
-
-#include "itkImage.h"
-#include "itkImageFileReader.h"
-#include "itkByteSwapper.h"
-
-
-void initialize_IO()
-{
-  itk::ImageIOFactory::RegisterBuiltInFactories();
-  clitk::VoxImageIOFactory::RegisterOneFactory();
-  clitk::VfImageIOFactory::RegisterOneFactory();
-  nkitk::XDRImageIOFactory::RegisterOneFactory();
-}

diff --git a/vv/vvInit.h b/vv/vvInit.h
deleted file mode 100644 (file)
index 661129a..0000000
--- a/vv/vvInit.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*=========================================================================
-  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
-
-  Authors belong to: 
-  - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://www.centreleonberard.fr
-  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
-
-  This software is distributed WITHOUT ANY WARRANTY; without even
-  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the copyright notices for more information.
-
-  It is distributed under dual licence
-
-  - BSD        See included LICENSE.txt file
-  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-===========================================================================**/
-#ifndef vvInit_h
-#define vvInit_h
-#endif

diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx
index 2473c87e27c3ca8dd84b33c047d199bea685f7b3..8141ccd5729d479ce39405f4266c04c0c5f00cd6 100644 (file)
--- a/vv/vvSlicer.cxx
+++ b/vv/vvSlicer.cxx
@@ -755,12 +755,14 @@ void vvSlicer::SetSliceOrientation(int orientation)
 // of the displayed image in the slicing direction.
 void vvSlicer::AdjustResliceToSliceOrientation(vtkImageReslice *reslice)
 {
-  // Reset autocrop
-  double origin[3] = {VTK_DOUBLE_MAX, VTK_DOUBLE_MAX, VTK_DOUBLE_MAX};
-  double spacing[3] = {VTK_DOUBLE_MAX, VTK_DOUBLE_MAX, VTK_DOUBLE_MAX};
-  reslice->SetOutputOrigin(origin);
-  reslice->SetOutputSpacing(spacing);
+  // Reset autocrop and update output information
+  reslice->SetOutputOriginToDefault();
+  reslice->SetOutputSpacingToDefault();
   reslice->GetOutput()->UpdateInformation();
+
+  // Ge new origin / spacing
+  double origin[3];
+  double spacing[3];
   reslice->GetOutput()->GetOrigin(origin);
   reslice->GetOutput()->GetSpacing(spacing);