X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkPackage.h;h=9a1c46a9e43b0fa42b8f99246598077d3d1e9c01;hb=3194643ec93a3ca8c423011a52d9509e2651d1cb;hp=089dbee65498918ab3c7c829d20a754d994c6b84;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/kernel/src/bbtkPackage.h b/kernel/src/bbtkPackage.h
index 089dbee..9a1c46a 100644
--- a/kernel/src/bbtkPackage.h
+++ b/kernel/src/bbtkPackage.h
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:15 $
-  Version:   $Revision: 1.8 $
-                                                                                
-  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/01/13 08:45:27 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 bbtk::Package : registers black boxes descriptors and is able to create instances of the black boxes registered.
@@ -45,8 +58,7 @@ namespace bbtk
     static Pointer New(const std::string& name,
 		       const std::string& author,
 		       const std::string& description,
-		       const std::string& version,
-		       const std::string& BBTKVersion);
+		       const std::string& version);
     /// Creates a package from a dynamic library
     static Pointer CreateFromDynamicLibrary(const std::string& libname,
 					    const std::string& pkgname,
@@ -115,7 +127,7 @@ namespace bbtk
     /// Returns the version of the package
     const std::string& GetVersion() const { return mVersion; }
 
-    bool ContainsBlackBox(const std::string& boxname) const;
+	bool ContainsBlackBox(const std::string& boxname) const;
 
  
     BlackBox::Pointer NewBlackBox(const std::string& type,
@@ -228,8 +240,7 @@ namespace bbtk
     Package(const std::string& name,
 	    const std::string& author,
 	    const std::string& description,
-	    const std::string& version,
-	    const std::string& BBTKVersion);
+	    const std::string& version);
     /// Does unload a package (no test)
     static void UnLoad(Package::WeakPointer p);
 
@@ -327,14 +338,28 @@ namespace bbtk
 	  bbtk::Package::New(#NAME,					\
 			     AUTHOR,					\
 			     DESCRIPTION,				\
-			     VERSION,					\
-			     BBTK_STRINGIFY_SYMBOL(BBTK_VERSION)	\
+			     VERSION	\
 			     );						\
+      bbtk::Object::InsertInPackageList( NAME ## GetPackagePointer() ); \
       return NAME ## GetPackagePointer();				\
     }									\
     BBTK_PACKAGE_EXPORT const std::string&				\
-    BBTK_CDECL NAME ## GetPackageBBTKVersion ()	\
+    BBTK_CDECL NAME ## GetPackageBBTKVersion ()				\
     { return bbtk::GetVersion(); }					\
+    class NAME ## PackageAutodestructor					\
+    {									\
+    public:								\
+      NAME ## PackageAutodestructor() {}				\
+      ~NAME ## PackageAutodestructor()					\
+      {									\
+	if (NAME ## GetPackagePointer().use_count()>0)			\
+	  {								\
+	    bbtk::Package::WeakPointer p = NAME ## GetPackagePointer();	\
+	    bbtk::Package::Release(p);					\
+	  }								\
+      }									\
+    };									\
+    NAME ## PackageAutodestructor NAME ## PackageAutodestructorInstance; \
   }
 //====================================================================