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

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

diff --git a/packages/vtk/src/bbvtkStructuredPointsReader.cxx b/packages/vtk/src/bbvtkStructuredPointsReader.cxx
index 1c0b1822df124031386ac5d7629a1fe95c0011ed..4dd352be5cdfb93d7279bad332fad4ff72326efa 100644 (file)
--- a/packages/vtk/src/bbvtkStructuredPointsReader.cxx
+++ b/packages/vtk/src/bbvtkStructuredPointsReader.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 "bbvtkStructuredPointsReader.h"
@@ -26,11 +53,19 @@ void StructuredPointsReader::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
 
-       if ( bbGetInputIn().c_str()!="")
+    //warning: comparison with string literal results in unspecified behaviour
+       //if ( bbGetInputIn().c_str()!="")
+    std::string empty("");  // JPR
+    if ( bbGetInputIn().c_str()!=empty)
        {
                spr -> SetFileName( bbGetInputIn().c_str() );
                sp = spr->GetOutput();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                sp -> Update();
+#else
+               spr -> Update();
+#endif
                bbSetOutputOut( sp );
        } else {
                bbSetOutputOut( NULL );