X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitkvtk%2Fsrc%2FbbitkvtkitkImage2vtkImageData.cxx;h=0047b30bce1fb728c559141438289c86389f4307;hb=26550d07aa8d312e33a18a19b8844ba249202336;hp=04b523d52e68a271a5923881ceb74a254b6aa015;hpb=c0e5c17c45ecb106079122fcf1c7005b173092e5;p=bbtk.git

diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
index 04b523d..0047b30 100644
--- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
+++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbitkvtkitkImage2vtkImageData.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/03/03 11:49:17 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/05/09 10:39:46 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -32,7 +32,7 @@
 
 namespace bbitkvtk 
 {
-  BBTK_USER_BLACK_BOX_IMPLEMENTATION(itkImage2vtkImageData,bbtk::AtomicBlackBox);
+  BBTK_BLACK_BOX_IMPLEMENTATION(itkImage2vtkImageData,bbtk::AtomicBlackBox);
 
   BBTK_ADD_BLACK_BOX_TO_PACKAGE(itkvtk,itkImage2vtkImageData);
 
@@ -64,13 +64,11 @@ namespace bbitkvtk
 	typename ItkToVtkConnection::Pointer conv = ItkToVtkConnection::New();
 	conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
 	conv->Update();
-	vtkImageData* o = vtkImageData::New();
-	//	o->SetReferenceCount(10);
-	o->DeepCopy(conv->GetOutput());
-
-	//	o->Print(std::cout);
-	if (bbGetOutputOut()) bbGetOutputOut()->Delete();
-	bbSetOutputOut(o);
+	if (bbGetOutputOut()) bbGetOutputOut()->UnRegister(NULL);
+	bbSetOutputOut(conv->GetOutput());
+	//	bbGetOutputOut()->DebugOn();
+	bbGetOutputOut()->Register(NULL);
+	bbGetOutputOut()->SetSource(NULL);
       }
     catch( itk::ExceptionObject & e) 
       {
@@ -78,12 +76,24 @@ namespace bbitkvtk
 		  <<bbtk::TypeName<T>()
 		  <<">::Convert() : "<<e);
       } 
-
-    
-
     bbtkDebugDecTab("Core",9);
   }
 
+  void itkImage2vtkImageData::bbUserConstructor()
+  {
+    bbSetOutputOut(NULL);
+  }
+  void itkImage2vtkImageData::bbUserCopyConstructor()
+  {
+    bbSetOutputOut(NULL);
+  }
+  void itkImage2vtkImageData::bbUserDestructor()
+  {
+    if (bbGetOutputOut()) 
+      {
+	bbGetOutputOut()->UnRegister(NULL);
+      }
+  }
 
 
 }