X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkExtractVtkImageFilter.cxx;h=30ca25a508d7d6005997cf524b2e614fef4124ca;hb=fc44a74636803d2efca46c6e66562a839e9d52f1;hp=aed1148e992eaea919aa4719b12147645e25a969;hpb=ccafd8577d65aa01902f8d20670a2c6da8f73e70;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx b/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx
index aed1148..30ca25a 100644
--- a/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx
+++ b/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx
@@ -1,4 +1,31 @@
-//===== 
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
+//=====
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 #include "bbvtkExtractVtkImageFilter.h"
@@ -22,9 +49,17 @@ void ExtractVtkImageFilter::Process()
 	voi[4] = bbGetInputIndex()[2];
 	voi[5] = bbGetInputIndex()[2]+bbGetInputSize()[2]-1;
 	
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
 	_extract->SetInput( bbGetInputIn() );
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+	_extract->SetInputData( bbGetInputIn() );
+#endif
+
 	_extract->SetVOI(voi);	
 	_extract->UpdateWholeExtent();
+	_extract->Modified();
 	_extract->Update();
 	bbSetOutputOut(_extract->GetOutput());
 }
@@ -53,7 +88,7 @@ void ExtractVtkImageFilter::bbUserSetDefaultValues()
 	bbSetInputIndex(tmpIndex);
 	bbSetInputSize(tmpSize);
 	
-	bbSetOutputOut(0);
+	bbSetOutputOut(NULL);
   
 }
 //=====