Merge branch 'vtk8itk5wx3-mingw64' of ssh://git.creatis.insa-lyon.fr/bbtk into vtk8it...

[bbtk.git] / packages / vtk / src / bbvtkImageCastToUShort.cxx

diff --git a/packages/vtk/src/bbvtkImageCastToUShort.cxx b/packages/vtk/src/bbvtkImageCastToUShort.cxx
index 06fdd14e2fa74f0b4deb1b95a57788b3d5988235..b27dbb6c5f2a789d13a433962bc033b7c742e17e 100644 (file)
--- a/packages/vtk/src/bbvtkImageCastToUShort.cxx
+++ b/packages/vtk/src/bbvtkImageCastToUShort.cxx
@@ -1,3 +1,30 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 #include "bbvtkImageCastToUShort.h"
 #include "bbvtkPackage.h"
 namespace bbvtk
@@ -21,11 +48,19 @@ void ImageCastToUShort::Process()
 //      (the one provided in the attribute 'type' of the tag 'input') 
 
        vtkImageData* img = bbGetInputIn();     
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
        cast->SetInput(img);
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+       cast->SetInputData(img);
+#endif
+
        cast->SetOutputScalarTypeToUnsignedShort();
+       cast->Modified();
        cast->Update();
     bbSetOutputOut(cast->GetOutput() );   
-  
 }
 void ImageCastToUShort::bbUserSetDefaultValues()
 {
@@ -45,7 +80,6 @@ void ImageCastToUShort::bbUserInitializeProcessing()
 //    if any  
 
        cast = vtkImageCast::New(); 
-  
 }
 void ImageCastToUShort::bbUserFinalizeProcessing()
 {
@@ -56,6 +90,7 @@ void ImageCastToUShort::bbUserFinalizeProcessing()
 //    if any 
   
 }
+
 }
 // EO namespace bbvtk