X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.cxx;h=cfbeb4ca7c6598f7f15362313cd38fe23dec9903;hb=d855c3ffb822de9b407c3594a08fd6c26423454c;hp=852e4d9759bfbc4ac2dcb8461980ee77f4315ce4;hpb=4ad7fcc03df98849a36051440ebcd326f90a5e68;p=bbtk.git

diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
index 852e4d9..cfbeb4c 100644
--- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
+++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbitkvtkitkImage2vtkImageData.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/05/14 07:01:00 $
-  Version:   $Revision: 1.4 $
-                                                                                
-  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/18 10:45:46 $
+  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 
@@ -49,12 +62,13 @@ namespace bbitkvtk
 
    template<class T>
    void itkImage2vtkImageData::Convert()
-  {
+   {
     bbtkDebugMessage("process",5,"==> ["<<bbGetFullName()<<"] : Convert<"
 		     <<bbtk::TypeName<T>()
 		     <<">()"<<std::endl);
 
     typedef T itkImageType;
+	typedef itkImageType* itkImageTypePointer;
     typedef itk::ImageToVTKImageFilter< itkImageType > ItkToVtkConnection;
     typename ItkToVtkConnection::Pointer conv;
 
@@ -64,7 +78,7 @@ namespace bbitkvtk
 	bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : No converter yet : creating it"<<std::endl);
 	conv = ItkToVtkConnection::New();
 	mConverter = conv;
-	conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	conv->SetInput( this->bbGetInputIn().get< itkImageTypePointer >() );
       }
     else 
       {
@@ -81,16 +95,16 @@ namespace bbitkvtk
 	    mConverter->UnRegister();
 	    conv = ItkToVtkConnection::New();
 	    mConverter = conv;
-	    conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	    conv->SetInput( this->bbGetInputIn().get<itkImageTypePointer>() );
 	  }
 	// Input image type did not change but input image pointer did:
 	// set new input
-	else if ( this->bbGetInputIn().get<itkImageType*>() 
+	else if ( this->bbGetInputIn().get<itkImageTypePointer>() 
 		  != (itkImageType*)(conv->GetExporter()->GetInputs()[0].GetPointer()))
 	  {
 	    bbtkDebugMessage("process",5,"    ["<<bbGetFullName()<<"] : Converter input changed : resetting it"<<std::endl);
 
-	    conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+	    conv->SetInput( this->bbGetInputIn().get<itkImageTypePointer>() );
 	  }
 	else 
 	  {
@@ -119,21 +133,21 @@ namespace bbitkvtk
 
  }
 
-  void itkImage2vtkImageData::bbUserConstructor()
-  {
-    bbSetOutputOut(NULL);
-    mConverter = 0;
-  }
-  void itkImage2vtkImageData::bbUserCopyConstructor()
+  void itkImage2vtkImageData::bbUserSetDefaultValues()
   {
     bbSetOutputOut(NULL);
     mConverter = 0;
   }
-  void itkImage2vtkImageData::bbUserDestructor()
-  {
-  }
-  
 
+  void itkImage2vtkImageData::bbUserInitializeProcessing()
+	{
+	}
+	
+	void itkImage2vtkImageData::bbUserFinalizeProcessing()	
+	{
+	}
+
+	
 }
 // eo namespace bbitkvtk