X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmUtil.h;h=6668b8035d38ec7d36fde1790a1791e5ecb4c696;hb=f6204e4795251ff95c653e32e8cdca61d2c19880;hp=3432bf933ae2ecfd2f3fa33e50ccde5bef15db19;hpb=c912efe3318a297cfa8ce267ab57cfee973c8125;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 3432bf93..6668b803 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,26 +1,54 @@
-// gdcmUtil.h
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.h,v $
+  Language:  C++
+  Date:      $Date: 2004/10/27 22:58:06 $
+  Version:   $Revision: 1.38 $
+                                                                                
+  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.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.
+                                                                                
+=========================================================================*/
 
-#include <iostream>
+#ifndef GDCMUTIL_H
+#define GDCMUTIL_H
+
+#include "gdcmCommon.h"
 #include <vector>
 #include <string>
-using namespace std;
 
-class gdcmDebug {
-private:
-	int DebugLevel;
-public:
-	gdcmDebug(int  = 0);
-	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);
-};
+namespace gdcm 
+{
+/**
+ * \defgroup Globals Utility functions
+ * \brief    Here are some utility functions, belonging to the Util class,
+ *           dealing with strings, file names... that can be called
+ *           from anywhere by whomsoever they can help.
+ */
 
-istream & eatwhite(istream & is);
+//-----------------------------------------------------------------------------
 
-void Tokenize (const string& str,
-               vector<string>& tokens,
-               const string& delimiters = " ");
+class GDCM_EXPORT Util
+{
+public:
+   static std::string Format(const char* format, ...);
+   static void        Tokenize (const std::string& str,
+                                std::vector<std::string>& tokens,
+                                const std::string& delimiters = " ");
+   static int         CountSubstring (const std::string& str,
+                                      const std::string& subStr);       
 
-extern gdcmDebug dbg;
+   static std::string CreateCleanString(std::string const & s);
+   static std::string NormalizePath(std::string const & name);
+   static std::string GetPath(std::string const &fullName);
+   static std::string GetName(std::string const &fullName);
+};
+} // end namespace gdcm
+//-----------------------------------------------------------------------------
+#endif