X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkUtilities.cxx;h=8cd21b8db5dafabbe02ae8ac621f315ec2fa61e0;hb=cd39bfaca5c64598de7046df6989f244fc6e32cd;hp=21fa9479f3ceb892e86e48b51a177caa9a57d885;hpb=8822f9075c66dcf742b9edae47271bb46af6a9b7;p=bbtk.git

diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx
index 21fa947..8cd21b8 100644
--- a/kernel/src/bbtkUtilities.cxx
+++ b/kernel/src/bbtkUtilities.cxx
@@ -1,38 +1,56 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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: bbtkUtilities.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/01/27 14:22:57 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.15 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 
 #include "bbtkUtilities.h"
 #include "bbtkMessageManager.h"
 
- 
+#if defined(MACOSX) // assume this is OSX 
+# include <sys/param.h>
+# include <mach-o/dyld.h> // _NSGetExecutablePath : must add -framework CoreFoundation to link line 
+# include <string.h>
+# ifndef PATH_MAX
+#  define PATH_MAX MAXPATHLEN
+# endif
+#endif // MACOSX
+
+#ifndef PATH_MAX // If not defined yet : do it 
+#  define PATH_MAX 2048
+#endif 
 
 namespace bbtk
 {
@@ -254,7 +272,8 @@ namespace bbtk
   std::string Utilities::MakeLibnameFromPath(std::string path, std::string pkgname)
   {
     std::string libname = path;
-    char c = path[path.size()-1];    
+	if(path.size()>0){
+		char c = path[path.size()-1];    
 #if defined(__GNUC__)
        if (c != '/')
           libname += "/libbb";
@@ -268,11 +287,15 @@ namespace bbtk
 #endif	
 	  
 #elif defined(_WIN32)
-       if (c != '\\')
-          libname = path+"\\bb";
+       if (c != '\\') 
+          libname += "\\bb";
+       else
+          libname += "bb";
        libname += pkgname;
        libname += ".dll";
 #endif
+	}
+    
     return libname;    
   }
 
@@ -281,23 +304,26 @@ namespace bbtk
   std::string Utilities::MakePkgnameFromPath(std::string path, std::string pkgname, bool addExt)
   {
     std::string libname = path;
-    char c = path[path.size()-1];
-    if (c != '/' && c != '\\')
-    {
-       libname +=  ConfigurationFile::GetInstance().Get_file_separator ();
-    }
-    libname += pkgname;
-    if (addExt)
-    {
-       int l = libname.size();
-       if (l>4)
-       {
-          if (libname.substr(l-4, 4) != ".bbs")
-          {
-               libname = libname + ".bbs";
-          }
-       }
-    }
+	if(path.size()>0){
+		char c = path[path.size()-1];
+		if (c != '/' && c != '\\')
+		{
+		   libname +=  ConfigurationFile::GetInstance().Get_file_separator ();
+		}
+		libname += pkgname;
+		if (addExt)
+		{
+		   int l = libname.size();
+		   if (l>4)
+		   {
+			  if (libname.substr(l-4, 4) != ".bbs")
+			  {
+				   libname = libname + ".bbs";
+			  }
+		   }
+		}
+	}
+    
     return libname;
   }
   // =======================================================================