X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.h;h=dd773b90a222f246915a4ed4dc364602c5af8337;hb=64953af6e7389a36c4fb533b58bf720ba1342cd7;hp=35238a5b4f282bb9be3486971e98ce4aece6e39e;hpb=c0e5c17c45ecb106079122fcf1c7005b173092e5;p=bbtk.git

diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h
index 35238a5..dd773b9 100644
--- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h
+++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbitkvtkitkImage2vtkImageData.h,v $
   Language:  C++
-  Date:      $Date: 2008/03/03 11:49:17 $
-  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: 2009/05/14 16:21:15 $
+  Version:   $Revision: 1.9 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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.
+* ------------------------------------------------------------------------ */                                                                         
+
 /**
  * \file 
  * \brief class itkImage2vtkImageData : converts a generic itkImage to a vtkImageData
@@ -39,20 +52,19 @@ namespace bbitkvtk
   class itkImage2vtkImageData : public bbtk::AtomicBlackBox  
   {
     
-    BBTK_USER_BLACK_BOX_INTERFACE(itkImage2vtkImageData,
-				  bbtk::AtomicBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(itkImage2vtkImageData,
+			     bbtk::AtomicBlackBox);
 
     BBTK_DECLARE_INPUT(In,bbitk::anyImagePointer);
     BBTK_DECLARE_OUTPUT(Out,vtkImageData*);
     BBTK_PROCESS(Convert);
     void Convert();
-    void bbUserConstructor() { bbSetOutputOut(0); }
   private:
     // Convert method template on type of the itk image 
     // embedded in the input itkImage*
     template<class T> void Convert();
-
- 
+    // stores the pointer on the template itk::ImageToVTKImageFilter 
+    itk::ProcessObject::Pointer mConverter;
   }; 
   
 
@@ -64,10 +76,10 @@ namespace bbitkvtk
   BBTK_DESCRIPTION("Converts a generic itkImage to a vtkImageData");
   BBTK_DEFAULT_ADAPTOR();
   BBTK_INPUT(itkImage2vtkImageData,In,
-	     "Input itkImage",bbitk::anyImagePointer);
+	     "Input itkImage",bbitk::anyImagePointer,"");
   BBTK_OUTPUT(itkImage2vtkImageData,Out,
 	      "Output vtkImageData",
-	      vtkImageData*);
+	      vtkImageData*,"");
   BBTK_END_DESCRIBE_BLACK_BOX(itkImage2vtkImageData);
   //=================================================================