#3113 crea Rigid Registration Bug New Normal - branch vtk7itk4 compilation with...

[creaRigidRegistration.git] / lib / Surface.cxx

diff --git a/lib/Surface.cxx b/lib/Surface.cxx
index 0886e13cc743f4a608b8493bc0a808b83eeac40e..5f4f710c4ac59a7c2fec39802c5fdd7129a2ee8e 100644 (file)
--- a/lib/Surface.cxx
+++ b/lib/Surface.cxx
@@ -1,3 +1,29 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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 "vtkImageData.h"
 #include "vtkImageCast.h"
 #include "vtkActor.h"
@@ -180,10 +206,20 @@ void Surface::surface(vtkImageData* imageData)
        vtkPolyData* surfaceData = vtkPolyData::New();
        surfaceData->SetPolys(surfaceCells);
        surfaceData->SetPoints(surfacePoints);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        surfaceData->Update();
+#else
+       // ..
+#endif
 
        vtkPolyDataMapper* surfaceMapper = vtkPolyDataMapper::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        surfaceMapper->SetInput(surfaceData);
+#else
+       surfaceMapper->SetInputData(surfaceData);
+#endif
        surfaceMapper->Update();
 
     surfaceResult->SetMapper(surfaceMapper);