X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FitkVTKImageToImageFilter.txx;h=0da4748a8ee0bd04e390b16d74e0e27c67de60e9;hb=879ef5e3816ad657576269a96edda4ada4848bdf;hp=8a7799afda42e2003465555a4479183b5a22bcb4;hpb=c0e5c17c45ecb106079122fcf1c7005b173092e5;p=bbtk.git

diff --git a/packages/itkvtk/src/itkVTKImageToImageFilter.txx b/packages/itkvtk/src/itkVTKImageToImageFilter.txx
index 8a7799a..0da4748 100644
--- a/packages/itkvtk/src/itkVTKImageToImageFilter.txx
+++ b/packages/itkvtk/src/itkVTKImageToImageFilter.txx
@@ -1,17 +1,38 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
 
   Program:   Insight Segmentation & Registration Toolkit
   Module:    $RCSfile: itkVTKImageToImageFilter.txx,v $
   Language:  C++
-  Date:      $Date: 2008/03/03 11:49:18 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2012/11/16 08:50:49 $
+  Version:   $Revision: 1.2 $
 
-  Copyright (c) 2002 Insight Consortium. All rights reserved.
-  See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
-
-     This software is distributed WITHOUT ANY WARRANTY; without even 
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
-     PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 #ifndef _itkVTKImageToImageFilter_txx
@@ -78,7 +99,12 @@ void
 VTKImageToImageFilter<TOutputImage>
 ::SetInput( vtkImageData * inputImage )
 {
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
   m_Exporter->SetInput( inputImage );
+#else
+  m_Exporter->SetInputData( inputImage );
+#endif
 }