X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=3ec7b666d11ff4dbba58c53fd82fca55e97f1305;hb=91e773ef94e63d181ea8e2a322ced8bf0427aa27;hp=b77fcb249740095ec16aa0355d568875fb43ef87;hpb=1bc5ccd72098866fc29ca8a786e8bb6852f388ea;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index b77fcb24..3ec7b666 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,11 +1,30 @@
-// gdcmUtil.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.h,v $
+  Language:  C++
+  Date:      $Date: 2004/10/12 04:35:48 $
+  Version:   $Revision: 1.36 $
+                                                                                
+  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.
+                                                                                
+=========================================================================*/
+
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
+#include "gdcmCommon.h"
 #include <vector>
 #include <string>
 
+namespace gdcm 
+{
 /**
  * \defgroup Globals Utility functions
  * \brief    Here are some utility functions, belonging to NO class,
@@ -14,15 +33,22 @@
  */
 
 //-----------------------------------------------------------------------------
-std::istream & eatwhite(std::istream & is);
 
-void Tokenize (const std::string& str,
-               std::vector<std::string>& tokens,
-               const std::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);       
 
-std::string CreateCleanString(std::string s);
-void        NormalizePath(std::string &name);
-std::string GetPath(std::string &fullName);
-std::string GetName(std::string &fullName);
+   static std::string CreateCleanString(std::string s);
+   static void        NormalizePath(std::string &name);
+   static std::string GetPath(std::string &fullName);
+   static std::string GetName(std::string &fullName);
+};
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif