avoid warning: comparison with string literal results in unspecified behaviour

[bbtk.git] / packages / vtk / src / bbvtkSegmentationConnectivity.h

diff --git a/packages/vtk/src/bbvtkSegmentationConnectivity.h b/packages/vtk/src/bbvtkSegmentationConnectivity.h
index 78f23563f8659126a926577122c2c169ece7213e..914fb172dcb9c43fe6537da524e6391ccfd1b253 100644 (file)
--- a/packages/vtk/src/bbvtkSegmentationConnectivity.h
+++ b/packages/vtk/src/bbvtkSegmentationConnectivity.h
@@ -1,21 +1,35 @@
-
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbvtkSegmentationConnectivity.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/24 12:56:41 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
-=========================================================================*//**
+  Date:      $Date: 2010/04/08 14:37:59 $
+  Version:   $Revision: 1.6 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  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.
+* ------------------------------------------------------------------------ */                                                                         
+
+
+/**
  * \brief Short description in one line
  * 
  * Long description which 
@@ -49,24 +63,21 @@ namespace bbvtk
     : 
     public bbtk::AtomicBlackBox
   {
-    BBTK_USER_BLACK_BOX_INTERFACE(SegmentationConnectivity,bbtk::AtomicBlackBox);
-      BBTK_DECLARE_INPUT(In,vtkImageData *);
-      BBTK_DECLARE_INPUT(PositionXYZ,std::vector<int>);
-         BBTK_DECLARE_INPUT(ThresholdMinMax,std::vector<int>);
-      BBTK_DECLARE_OUTPUT(Out,vtkImageData *);
+    BBTK_BLACK_BOX_INTERFACE(SegmentationConnectivity,bbtk::AtomicBlackBox);
+    BBTK_DECLARE_INPUT(In,vtkImageData *);
+    BBTK_DECLARE_INPUT(PositionXYZ,std::vector<int>);
+    BBTK_DECLARE_INPUT(ThresholdMinMax,std::vector<int>);
+    BBTK_DECLARE_OUTPUT(Out,vtkImageData *);
     BBTK_PROCESS(DoProcess);
     void DoProcess();
 
   protected:
-    virtual void bbUserConstructor();
 
   private:
-       vtkImageCast                            *cast2;
-       vtkImageCast                            *cast4; // binary segmentation result
-       vtkImageThreshold                       *thresh2;
-       vtkImageSeedConnectivity        *connect2;
-
-
+       vtkImageCast             *cast2;
+       vtkImageCast             *cast4; // binary segmentation result
+       vtkImageThreshold        *thresh2;
+       vtkImageSeedConnectivity *connect2;
 
   };
 
@@ -74,15 +85,14 @@ namespace bbvtk
   BBTK_NAME("SegmentationConnectivity");
   BBTK_AUTHOR("eduardo.davila [at] creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Segmentation with min max threshold and connectivity");
-    BBTK_INPUT(SegmentationConnectivity,In,"Input image",vtkImageData *);
-    BBTK_INPUT(SegmentationConnectivity,PositionXYZ,"vector with the Position [x y z]" , std::vector<int> );
-    BBTK_INPUT(SegmentationConnectivity,ThresholdMinMax,"vector with the Threshold [min max]" , std::vector<int> );
-    BBTK_OUTPUT(SegmentationConnectivity,Out,"Result image",vtkImageData *);
+  BBTK_INPUT(SegmentationConnectivity,In,"Input image",vtkImageData *,"");
+  BBTK_INPUT(SegmentationConnectivity,PositionXYZ,"vector with the Position [x y z]" , std::vector<int>,"");
+  BBTK_INPUT(SegmentationConnectivity,ThresholdMinMax,"vector with the Threshold [min max]" , std::vector<int>,"");
+  BBTK_OUTPUT(SegmentationConnectivity,Out,"Result image",vtkImageData *,"");
   BBTK_END_DESCRIBE_BLACK_BOX(SegmentationConnectivity);
 
 } // EO namespace bbvtk
 
 #endif //  __bbvtkSegmentationConnectivity_h_INCLUDED__
 
-
 #endif //_USE_VTK_