BUG: very same bug when using char* instead of string

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 4dcbc4fbf7ad0915955f5416222f823ddd7142d8..ae4f23f4e2f22fca66307c155d675be82befe032 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,89 +1,46 @@
-// gdcmUtil.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.h,v $
+  Language:  C++
+  Date:      $Date: 2004/06/20 18:08:48 $
+  Version:   $Revision: 1.29 $
+                                                                                
+  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/Gdcm/License.htm 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.
+                                                                                
+=========================================================================*/
+
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
-#include "gdcmCommon.h"
-#include "gdcmVR.h"
-#include "gdcmTS.h"
-#include "gdcmDictSet.h"
-#include "gdcmDicomDirElement.h"
-#include <iostream>
 #include <vector>
 #include <string>
 
-//-----------------------------------------------------------------------------
-/*
- * gdcmDebug is an object for debugging in program.
- * It has 2 debugging modes :
- *  - error : for bad library use
- *  - debug : for debugging messages
- * 
- * A debugging message has a level of priority and is 
- * Shown only when the debug level is higher than the 
- * message level.
- */
-class gdcmDebug {
-public:
-   gdcmDebug(int level = GDCM_DEBUG);
-
-  /**
-    * \ingroup gdcmDebug
-    * \brief   sets the debug level 
-    * @param i debug level to be set
-  */ 
-   void SetDebug (int i) 
-      {DebugLevel = i;}
-
-   void Verbose(int, const char*, const char* ="");
-   void Error(bool, const char*,  const char* ="");
-   void Error(const char*, const char* ="", const char* ="");
-
-   void Assert(int, bool, const char*, const char*);
-   void Exit(int);
-
-private:
-/// warning message level to be displayed
-   int DebugLevel;
-};
+#include "gdcmCommon.h"
 
-//-----------------------------------------------------------------------------
-/*
- * This class contains all globals elements that might be
- * instanciated only one time
+/**
+ * \defgroup Globals Utility functions
+ * \brief    Here are some utility functions, belonging to NO class,
+ *           dealing with strings, file names... that can be called
+ *           from anywhere by whomsoever they can help.
  */
-class GDCM_EXPORT gdcmGlobal {
-public:
-   gdcmGlobal(void);
-   ~gdcmGlobal();
-
-   static gdcmDictSet *GetDicts(void);
-   static gdcmVR *GetVR(void);
-   static gdcmTS *GetTS(void);
-   static gdcmDicomDirElement *GetDicomDirElements(void);
-
-private:
-   static gdcmDictSet *Dicts; 
-   static gdcmVR *VR;
-   static gdcmTS *TS; 
-   static gdcmDicomDirElement *ddElem;
-};
 
 //-----------------------------------------------------------------------------
-std::istream & eatwhite(std::istream & is);
-
-   void Tokenize (const std::string& str,
-                  std::vector<std::string>& tokens,
-                  const std::string& delimiters = " ");
+GDCM_EXPORT std::istream & eatwhite(std::istream & is);
 
-   extern gdcmDebug dbg;
+GDCM_EXPORT void Tokenize (const std::string& str,
+               std::vector<std::string>& tokens,
+               const std::string& delimiters = " ");
 
-   char *_cleanString(char *v);
-   std::string _CreateCleanString(std::string s);
-
-   void NormalizePath (std::string &name);
-   std::string GetPath(std::string &fullName);
-   std::string GetName(std::string &fullName);
+GDCM_EXPORT std::string CreateCleanString(std::string s);
+GDCM_EXPORT void        NormalizePath(std::string &name);
+GDCM_EXPORT std::string GetPath(std::string &fullName);
+GDCM_EXPORT std::string GetName(std::string &fullName);
 //-----------------------------------------------------------------------------
 #endif
-