*** empty log message ***

[bbtk.git] / kernel / src / bbtkUtilities.cxx

diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx
index 0e57b2f904ef5ec7fac4170c096ab320580d01ed..778b45e215e705a18e2926d9f7bfee6ed1e962e0 100644 (file)
--- a/kernel/src/bbtkUtilities.cxx
+++ b/kernel/src/bbtkUtilities.cxx
@@ -1,4 +1,36 @@
+/*=========================================================================                                                                               
+  Program:   bbtk
+  Module:    $RCSfile: bbtkUtilities.cxx,v $
+  Language:  C++
+  Date:      $Date: 2008/12/12 10:20:48 $
+  Version:   $Revision: 1.10 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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"
 
  
 
@@ -229,8 +261,12 @@ namespace bbtk
        else
           libname += "libbb";
        libname += pkgname;
-       libname += ".so";
-         
+#if defined(MACOSX)
+         libname += ".dylib";
+#else
+         libname += ".so";
+#endif 
+         
 #elif defined(_WIN32)
        if (c != '\\')
           libname = path+"\\bb";
@@ -331,9 +367,9 @@ namespace bbtk
        }
       else
        {
-         // bbtkError(in<<" : expected 'a.b' format but no dot found");
          left ="";
          right = "";
+         bbtkGlobalError("Token '"<<in<<"' : expected 'a.b' format but no dot found");
        }
     }
     //=======================================================================
@@ -491,7 +527,7 @@ namespace bbtk
       std::string ss("\\n");
       std::string::size_type pos = 0;
       pos = s.find(ss,0);
-      char* cr = "\n";
+      const char* cr = "\n";
       while ( pos != std::string::npos )
        {
          s.replace(pos,2,cr,1);