COMP: ITK v4.6

diff --git a/common/clitkDicomRTStruct2ImageFilter.h b/common/clitkDicomRTStruct2ImageFilter.h
index 8f6045ae1e2b7100524464a6ee85c1faccde2a94..0df00dd46fcfca8a0bf86647487b26156b462eaf 100644 (file)
--- a/common/clitkDicomRTStruct2ImageFilter.h
+++ b/common/clitkDicomRTStruct2ImageFilter.h
@@ -18,7 +18,7 @@
   =========================================================================*/
 
 #ifndef CLITKDICOMRTSTRUCT2IMAGEFILTER_H
-#define CLITKDICOMRT_TRUCT2IMAGEFILTER_H
+#define CLITKDICOMRTSTRUCT2IMAGEFILTER_H
 
 #include "clitkDicomRT_ROI.h"
 #include "clitkImageCommon.h"

diff --git a/itk/clitkVectorBSplineDecompositionImageFilterWithOBD.txx b/itk/clitkVectorBSplineDecompositionImageFilterWithOBD.txx
index c29c6ef888be4d9cbc6c5416754d93ab6ed03100..7bc316527ff3c360e840729ecc9cf88bd2c220d2 100644 (file)
--- a/itk/clitkVectorBSplineDecompositionImageFilterWithOBD.txx
+++ b/itk/clitkVectorBSplineDecompositionImageFilterWithOBD.txx
@@ -291,8 +291,8 @@ VectorBSplineDecompositionImageFilterWithOBD<TInputImage, TOutputImage>
   InputIterator inIt( this->GetInput(), this->GetInput()->GetBufferedRegion() );
   OutputIterator outIt( this->GetOutput(), this->GetOutput()->GetBufferedRegion() );
 
-  inIt = inIt.Begin();
-  outIt = outIt.Begin();
+  inIt.GoToBegin();
+  outIt.GoToBegin();
   OutputPixelType v;
   while ( !outIt.IsAtEnd() ) {
     for (unsigned int i=0; i< VectorDimension; i++) {

diff --git a/registration/clitkBLUTDIRGenericFilter.cxx b/registration/clitkBLUTDIRGenericFilter.cxx
index c786eeb59dedbd6e1c50d48799e632af63dd126f..b49d9909639a88ae71874e1d12d3deabe8f99659 100644 (file)
--- a/registration/clitkBLUTDIRGenericFilter.cxx
+++ b/registration/clitkBLUTDIRGenericFilter.cxx
@@ -30,7 +30,16 @@ It is distributed under dual licence
 #include "clitkBLUTDIRGenericFilter.h"
 #include "clitkBLUTDIRCommandIterationUpdateDVF.h"
 #include "itkCenteredTransformInitializer.h"
-  
+#if ITK_VERSION_MAJOR >= 4
+#  if ITK_VERSION_MINOR < 6
+#    include "itkTransformToDisplacementFieldSource.h"
+#  else
+#    include "itkTransformToDisplacementFieldFilter.h"
+#  endif
+#else
+#  include "itkTransformToDeformationFieldSource.h"
+#endif
+
 namespace clitk
 {
 
@@ -793,7 +802,11 @@ namespace clitk
       typedef itk::Vector< float, SpaceDimension >  DisplacementType;
       typedef itk::Image< DisplacementType, InputImageType::ImageDimension >  DisplacementFieldType;
 #if ITK_VERSION_MAJOR >= 4
+#  if ITK_VERSION_MINOR < 6
       typedef itk::TransformToDisplacementFieldSource<DisplacementFieldType, double> ConvertorType;
+#  else
+      typedef itk::TransformToDisplacementFieldFilter<DisplacementFieldType, double> ConvertorType;
+#  endif
 #else
       typedef itk::TransformToDeformationFieldSource<DisplacementFieldType, double> ConvertorType;
 #endif
@@ -804,7 +817,11 @@ namespace clitk
       else
         transform->SetBulkTransform(NULL);
       filter->SetTransform(regTransform);
+#if ITK_VERSION_MAJOR > 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR >= 6)
+      filter->SetReferenceImage(fixedImage);
+#else
       filter->SetOutputParametersFromImage(fixedImage);
+#endif
       filter->Update();
       typename DisplacementFieldType::Pointer field = filter->GetOutput();
 

diff --git a/registration/clitkBLUTDIRGenericFilter.h b/registration/clitkBLUTDIRGenericFilter.h
index eda242f5b4d7d843a91cb2809dbbe319536d06db..18e1600ee9f12827730873a177325ebb3d00a338 100644 (file)
--- a/registration/clitkBLUTDIRGenericFilter.h
+++ b/registration/clitkBLUTDIRGenericFilter.h
@@ -60,11 +60,6 @@
 #include "itkLabelGeometryImageFilter.h"
 #include "itkImageDuplicator.h"
 #include "itkExtractImageFilter.h"
-#if ITK_VERSION_MAJOR >= 4
-  #include "itkTransformToDisplacementFieldSource.h"
-#else
-  #include "itkTransformToDeformationFieldSource.h"
-#endif
 
 namespace clitk
 {

diff --git a/registration/clitkBSplineDeformableTransform.txx b/registration/clitkBSplineDeformableTransform.txx
index 9d7cc6b8e2427d195544854ce540d75390a0789b..4d0f50df84f7e8d7d1190ccba02fb81bd8227abc 100644 (file)
--- a/registration/clitkBSplineDeformableTransform.txx
+++ b/registration/clitkBSplineDeformableTransform.txx
@@ -16,7 +16,7 @@
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
 ===========================================================================**/
 #ifndef __clitkBSplineDeformableTransform_txx
-#define __clitkBSplineDeformableTransform_tx
+#define __clitkBSplineDeformableTransform_txx
 #include "clitkBSplineDeformableTransform.h"
 
 //itk

diff --git a/registration/clitkConvertBLUTCoeffsToVFFilter.h b/registration/clitkConvertBLUTCoeffsToVFFilter.h
index 3cd1e676b0acdf9d23c37f194fd09f5363cbc227..76b1578b68c0a426674279f707f5eb44369b130e 100644 (file)
--- a/registration/clitkConvertBLUTCoeffsToVFFilter.h
+++ b/registration/clitkConvertBLUTCoeffsToVFFilter.h
@@ -8,9 +8,13 @@
 #include "clitkBSplineDeformableTransform.h"
 #include "itkBSplineDeformableTransform.h"
 #if ITK_VERSION_MAJOR >= 4
-#include "itkTransformToDisplacementFieldSource.h"
+#  if ITK_VERSION_MINOR < 6
+#    include "itkTransformToDisplacementFieldSource.h"
+#  else
+#    include "itkTransformToDisplacementFieldFilter.h"
+#  endif
 #else
-#include "itkTransformToDeformationFieldSource.h"
+#  include "itkTransformToDeformationFieldSource.h"
 #endif
 
 namespace clitk 
@@ -46,7 +50,11 @@ namespace clitk
     typedef itk::Transform< double, TDVFType::ImageDimension, TDVFType::ImageDimension> GenericTransformType;
     
 #if ITK_VERSION_MAJOR >= 4
+#  if ITK_VERSION_MINOR < 6
     typedef itk::TransformToDisplacementFieldSource<OutputImageType, double> ConvertorType;
+#  else
+    typedef itk::TransformToDisplacementFieldFilter<OutputImageType, double> ConvertorType;
+#  endif
 #else
     typedef itk::TransformToDeformationFieldSource<OutputImageType, double> ConvertorType;
 #endif
@@ -90,4 +98,4 @@ namespace clitk
 
 #include "clitkConvertBLUTCoeffsToVFFilter.txx"
 
-#endif // clitkConvertBLUTCoeffsToVFFilter_h
\ No newline at end of file
+#endif // clitkConvertBLUTCoeffsToVFFilter_h

diff --git a/registration/clitkConvertBLUTCoeffsToVFFilter.txx b/registration/clitkConvertBLUTCoeffsToVFFilter.txx
index ae1f9d539bd70d9425efbab1a760e324ba93771a..d10bcbb69f1f24579f5a8c3b82d4f668b7c7145c 100644 (file)
--- a/registration/clitkConvertBLUTCoeffsToVFFilter.txx
+++ b/registration/clitkConvertBLUTCoeffsToVFFilter.txx
@@ -7,11 +7,6 @@
 
 //#include "clitkConvertBSplineDeformableTransformToVFGenericFilter.h"
 #include "clitkVectorImageToImageFilter.h"
-#if ITK_VERSION_MAJOR >= 4
-#include "itkTransformToDisplacementFieldSource.h"
-#else
-#include "itkTransformToDeformationFieldSource.h"
-#endif
 #include "itkBSplineDeformableTransform.h"
 
 namespace clitk 
@@ -186,9 +181,13 @@ namespace clitk
       m_GenericTransform = m_ITKTransform;
     }
 
+#if ITK_VERSION_MAJOR > 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR >= 6)
+    m_Filter->SetReferenceImage(output);
+#else
     m_Filter->SetOutputOrigin(output->GetOrigin());
     m_Filter->SetOutputSpacing(output->GetSpacing());
     m_Filter->SetOutputSize(output->GetLargestPossibleRegion().GetSize());
+#endif
     m_Filter->SetTransform(m_GenericTransform);
 
     m_Filter->Update();

diff --git a/registration/clitkMatrixTransformToVFGenericFilter.h b/registration/clitkMatrixTransformToVFGenericFilter.h
index 717e938a4b667b86dfaebc3eea570d578789e222..cc6ae0016dd173533959b575e37fe988622f84ab 100644 (file)
--- a/registration/clitkMatrixTransformToVFGenericFilter.h
+++ b/registration/clitkMatrixTransformToVFGenericFilter.h
@@ -37,9 +37,13 @@
 //itk include
 #include "itkLightObject.h"
 #if ITK_VERSION_MAJOR >= 4
-  #include "itkTransformToDisplacementFieldSource.h"
+#  if ITK_VERSION_MINOR < 6
+#    include "itkTransformToDisplacementFieldSource.h"
+#  else
+#    include "itkTransformToDisplacementFieldFilter.h"
+#  endif
 #else
-  #include "itkTransformToDeformationFieldSource.h"
+#  include "itkTransformToDeformationFieldSource.h"
 #endif
 #include "itkAffineTransform.h"
 

diff --git a/registration/clitkMatrixTransformToVFGenericFilter.txx b/registration/clitkMatrixTransformToVFGenericFilter.txx
index ebc0e45c3ba6ba0beaf9d30dd05b5a954444ebad..d864900c0cc0d37a6d299d000634300fe818717c 100644 (file)
--- a/registration/clitkMatrixTransformToVFGenericFilter.txx
+++ b/registration/clitkMatrixTransformToVFGenericFilter.txx
@@ -79,10 +79,15 @@ namespace clitk
     
     // Filter
 #if ITK_VERSION_MAJOR >= 4
+#  if ITK_VERSION_MINOR < 6
     typedef itk::TransformToDisplacementFieldSource<OutputImageType, double> ConvertorType;
+#  else
+    typedef itk::TransformToDisplacementFieldFilter<OutputImageType, double> ConvertorType;
+#  endif
 #else
     typedef itk::TransformToDeformationFieldSource<OutputImageType, double> ConvertorType;
 #endif
+
     typename   ConvertorType::Pointer filter= ConvertorType::New();
 
     // Output image info
@@ -94,7 +99,11 @@ namespace clitk
        reader2->Update();
 
        typename OutputImageType::Pointer image=reader2->GetOutput();
-       filter->SetOutputParametersFromImage(image);
+#if ITK_VERSION_MAJOR > 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR >= 6)
+    filter->SetReferenceImage(image);
+#else
+    filter->SetOutputParametersFromImage(image);
+#endif
       }
     else
       {
@@ -118,8 +127,12 @@ namespace clitk
            typename OutputImageType::SizeType size;
            for(i=0;i<Dimension;i++)
              size[i]=m_ArgsInfo.size_arg[i];
-           filter->SetOutputSize(size);
-         }
+#if ITK_VERSION_MAJOR > 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR >= 6)
+        filter->SetSize(size);
+#else
+        filter->SetOutputSize(size);
+#endif
+      }
       }
     
     // Transform

diff --git a/vv/vtkVOXImageWriter.h b/vv/vtkVOXImageWriter.h
index 89b11a8a136c32ec0fd06482918ebb56edb09448..d64fbf0292c46fde3da17ba411f8f15f44787bbf 100644 (file)
--- a/vv/vtkVOXImageWriter.h
+++ b/vv/vtkVOXImageWriter.h
@@ -15,7 +15,7 @@
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
 ===========================================================================**/
-#ifndef __vtkVoxImageWriter_h
+#ifndef __vtkVOXImageWriter_h
 #define __vtkVOXImageWriter_h
 #include "vtkImageWriter.h"
 #include <string>

diff --git a/vv/vvSurfaceViewerDialog.h b/vv/vvSurfaceViewerDialog.h
index 90e8b98c54849f0479af286879d28bf520d09534..88a75a6924081fd4eca777d21dbed1c311dffac6 100644 (file)
--- a/vv/vvSurfaceViewerDialog.h
+++ b/vv/vvSurfaceViewerDialog.h
@@ -46,7 +46,7 @@ private :
     vtkPolyDataMapper* mMapper;
     vtkActor* mActor;
     vtkRenderer * mRenderer;
-    unsigned int mCurrentTime;
+    int mCurrentTime;
 
 }; // end class vvSurfaceViewerDialog
 //====================================================================