#3107 BBTK Bug New Normal - branch vtk7itk4 compilation with vtk7

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

diff --git a/packages/vtk/src/bbvtkPolyDataReaderPlus.cxx b/packages/vtk/src/bbvtkPolyDataReaderPlus.cxx
index ab887e2e8b1dd4b783af508dd2b862d8b3525420..2f7c44f770cbd9ecc4c3ce3e681b0c7b2183c85d 100644 (file)
--- a/packages/vtk/src/bbvtkPolyDataReaderPlus.cxx
+++ b/packages/vtk/src/bbvtkPolyDataReaderPlus.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 "bbvtkPolyDataReaderPlus.h"
 #include "bbvtkPackage.h"
 namespace bbvtk
@@ -35,7 +62,7 @@ void PolyDataReaderPlus::Process()
                        reader->SetFileName(bbGetInputInPath().data());
                        informacion = (vtkPolyData*)reader->GetOutput();
                        reader->CloseVTKFile();
-                       vtkPolyData* old = bbGetOutputOut();
+                       vtkPolyData* old = bbGetOutputOut();  // old unused ? // JPR
                        bbSetOutputOut(informacion);
                        readed = true;
                }
@@ -46,7 +73,7 @@ void PolyDataReaderPlus::Process()
                        reader->SetFileName(bbGetInputInPath().data());
                        informacion = reader->GetOutput();
 
-                       vtkPolyData* old = bbGetOutputOut();
+                       vtkPolyData* old = bbGetOutputOut();  // old unused ? // JPR
                        bbSetOutputOut(informacion);
                        readed = true;
                }
@@ -55,9 +82,14 @@ void PolyDataReaderPlus::Process()
        vtkActor *actor = (vtkActor*)bbGetOutputOutActor();
        vtkPolyDataMapper *mapper = vtkPolyDataMapper::New();
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        mapper->SetInput(informacion);
-       actor->SetMapper(mapper);
+#else
+       mapper->SetInputData(informacion);
+#endif
 
+       actor->SetMapper(mapper);
        bbSetOutputOutActor(actor);
 
        if (bbGetInputInColor().size()  >= 3)