X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkSliceImage.cxx;h=497e304db098280df9ef29b6f1dcbd4b8ffc42bd;hb=edb8e9b8948e7216e06b3ef5228b16f18417ca52;hp=5116d7bada6f6f5f883a70e582873c7e934a8447;hpb=5383f06c991adc435baefd87d970100b9cf6042e;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkSliceImage.cxx b/packages/vtk/src/bbvtkSliceImage.cxx
index 5116d7b..497e304 100755
--- a/packages/vtk/src/bbvtkSliceImage.cxx
+++ b/packages/vtk/src/bbvtkSliceImage.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 "bbvtkSliceImage.h"
 #include "bbvtkPackage.h"
 namespace bbvtk
@@ -7,6 +34,9 @@ BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,SliceImage)
 BBTK_BLACK_BOX_IMPLEMENTATION(SliceImage,bbtk::AtomicBlackBox);
 void SliceImage::Process()
 {
+
+printf("EED ********************************** bbtk-box vtk:SliceImage (Deprecated)\n");
+printf("EED **********************************   >> use bbtk-box creaMaracasVisu:SliceImage \n");
 	vtkImageData* original = bbGetInputIn();
 
 	if (original == NULL)
@@ -40,10 +70,15 @@ void SliceImage::Process()
 		final = vtkImageData::New();
 		final->SetSpacing(space);
 		final->SetDimensions(newDim);
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		final->SetScalarType(scalar_type);
 		final->AllocateScalars();
 		final->Update();
-
+#else
+		final->AllocateScalars(scalar_type,1);
+#endif
 
 	}
 
@@ -113,7 +148,13 @@ void SliceImage::Process()
 	}
 
 	caster = vtkImageCast::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	caster->SetInput(final);
+#else
+	caster->SetInputData(final);
+#endif
+
 	caster->SetOutputScalarTypeToShort();
 	caster->Update();