X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.h;h=0ea7901ae76ef7b3d0dc9ab9bfdc94c1c4deec41;hb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;hp=8e52ec69e114be3d143a979e19e6f2a23d887c97;hpb=1e2df7fb6ae571ce1cf72e6af1715f0e34675cbf;p=bbtk.git

diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h
index 8e52ec6..0ea7901 100644
--- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h
+++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h
@@ -1,40 +1,47 @@
-/*=========================================================================                                                                               
+/*
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbitkvtkitkImage2vtkImageData.h,v $
   Language:  C++
-  Date:      $Date: 2008/11/25 11:17:18 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2012/11/16 08:50:49 $
+  Version:   $Revision: 1.11 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
 
-* 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
+ * \brief class itkImage2vtkImageData : converts a generic itkImage to a vtkImageData*
  */
 /**
  * \class itkImage2vtkImageData 
- * \brief converts a generic itkImage to a vtkImageData
+ * \brief converts a generic itkImage to a vtkImageData*
  */
 #ifdef _USE_ITK_
 #ifdef _USE_VTK_
@@ -55,13 +62,11 @@ namespace bbitkvtk
     BBTK_BLACK_BOX_INTERFACE(itkImage2vtkImageData,
 			     bbtk::AtomicBlackBox);
 
-    BBTK_DECLARE_INPUT(In,bbitk::anyImagePointer);
+    BBTK_DECLARE_INPUT(In,  bbitk::anyImagePointer);
     BBTK_DECLARE_OUTPUT(Out,vtkImageData*);
     BBTK_PROCESS(Convert);
     void Convert();
-    void bbUserConstructor();
-    void bbUserCopyConstructor(bbtk::BlackBox::Pointer);
-    void bbUserDestructor();
+
   private:
     // Convert method template on type of the itk image 
     // embedded in the input itkImage*
@@ -81,11 +86,11 @@ namespace bbitkvtk
   BBTK_INPUT(itkImage2vtkImageData,In,
 	     "Input itkImage",bbitk::anyImagePointer,"");
   BBTK_OUTPUT(itkImage2vtkImageData,Out,
-	      "Output vtkImageData",
+	      "Output vtkImageData*",
 	      vtkImageData*,"");
   BBTK_END_DESCRIBE_BLACK_BOX(itkImage2vtkImageData);
   //=================================================================
-   
+
 
 }
 //namespace bbitkvtk