X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=0d3334fec9f1646a5e19f26b7fcf2e1647507045;hb=559c3639fc5b255b36a951f352db1addead9f78f;hp=ab5fdd7c35c692b6cd77f6e2d29648e2d5af9e00;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index ab5fdd7c..0d3334fe 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.h,v $
   Language:  C++
-  Date:      $Date: 2004/09/27 08:39:08 $
-  Version:   $Revision: 1.31 $
+  Date:      $Date: 2004/11/03 20:52:13 $
+  Version:   $Revision: 1.39 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,30 +19,43 @@
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
+#include "gdcmCommon.h"
 #include <vector>
 #include <string>
 
-#include "gdcmCommon.h"
-
+namespace gdcm 
+{
 /**
  * \defgroup Globals Utility functions
- * \brief    Here are some utility functions, belonging to NO class,
+ * \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.
  */
 
 //-----------------------------------------------------------------------------
-GDCM_EXPORT std::istream & eatwhite(std::istream & is);
 
-GDCM_EXPORT void Tokenize (const std::string& str,
-                          std::vector<std::string>& tokens,
-                          const std::string& delimiters = " ");
-GDCM_EXPORT int  CountSubstring (const std::string& str,
-                                 const std::string& subStr);       
+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);       
+
+   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);
 
-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);
+};
+   template <class T>
+   std::ostream& binary_write(std::ostream& os, const T& val);
+   std::ostream& binary_write(std::ostream& os, const uint16_t& val);
+   std::ostream& binary_write(std::ostream& os, const uint32_t& val);
+   std::ostream& binary_write(std::ostream& os, const char* val);
+   std::ostream& binary_write(std::ostream& os, std::string const & val);
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif