X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=itk%2FitkVTKImageToImageFilter.txx;h=5fddba28f6d49f17db81cd18ae91f8435a234e88;hb=a523f5be1e221995c0d4d29a0077b5e8b984c96d;hp=27474df0254783d7f358407afeeec03a901bac8b;hpb=573d80d0f7a17607d2ee883c21c940c0ba020282;p=clitk.git

diff --git a/itk/itkVTKImageToImageFilter.txx b/itk/itkVTKImageToImageFilter.txx
index 27474df..5fddba2 100644
--- a/itk/itkVTKImageToImageFilter.txx
+++ b/itk/itkVTKImageToImageFilter.txx
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://www.centreleonberard.fr
+  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,7 +14,7 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-===========================================================================**/
+======================================================================-====*/
 #ifndef _itkVTKImageToImageFilter_txx
 #define _itkVTKImageToImageFilter_txx
 #include "itkVTKImageToImageFilter.h"
@@ -77,7 +77,11 @@ void
 VTKImageToImageFilter<TOutputImage>
 ::SetInput( vtkImageData * inputImage )
 {
+#if VTK_MAJOR_VERSION <= 5
   m_Exporter->SetInput( inputImage );
+#else
+  m_Exporter->SetInputData( inputImage );
+#endif
 }
 
 
@@ -86,7 +90,8 @@ VTKImageToImageFilter<TOutputImage>
  * Get an itk::Image as output
  */
 template <class TOutputImage>
-const typename VTKImageToImageFilter<TOutputImage>::OutputImageType *
+//const 
+typename VTKImageToImageFilter<TOutputImage>::OutputImageType *
 VTKImageToImageFilter<TOutputImage>
 ::GetOutput() const
 {