X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmUtil.h;h=a32b5f2c4bff926aecd4c26edce227abfe8b535d;hb=24a0635a8871074306d25000a2989d4959841e8a;hp=7c7a59532b2ea333df03c973f75c90dd5ee785aa;hpb=db0a6b6546749ea7631199275605e94726a3a63f;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 7c7a5953..a32b5f2c 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/10/07 21:05:40 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2004/11/05 20:23:14 $
+  Version:   $Revision: 1.40 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,26 +23,42 @@
 #include <vector>
 #include <string>
 
-
+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);       
-
-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);
+
+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);
+
+   static std::string DicomString(const char* s, size_t l);
+   static std::string DicomString(const char* s);
+};
+
+   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