* Fix some compilation warnings

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 3a7971b28486546cb5997952700aa807ef19b44a..9f9287167eab2f726d548b74c4c56c64e31cfd4b 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.h,v $
   Language:  C++
-  Date:      $Date: 2005/08/22 15:38:05 $
-  Version:   $Revision: 1.60 $
+  Date:      $Date: 2005/10/18 08:35:51 $
+  Version:   $Revision: 1.63 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -41,16 +41,21 @@ public:
                                 std::vector<std::string> &tokens,
                                 const std::string &delimiters = " ");
    static int         CountSubstring (const std::string &str,
-                                      const std::string &subStr);       
+                                      const std::string &subStr);
 
    static std::string CreateCleanString(std::string const &s);
+   static std::string CreateCleanString(uint8_t *s, int l);
+   static bool IsCleanString(std::string const &s);
+   static bool IsCleanArea(uint8_t *s, int l);
    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 GetCurrentDate();
    static std::string GetCurrentTime();
    static std::string GetCurrentDateTime();
-   static std::string GetVersion();
+   /// Provides a simple static GetVersion() function
+   static std::string GetVersion() 
+                      { return GDCM_VERSION;}
    static unsigned int GetCurrentThreadID();
    static unsigned int GetCurrentProcessID();
    static bool         IsCurrentProcessorBigEndian();
@@ -67,9 +72,9 @@ public:
    static const std::string &GetRootUID();
 
    static const uint8_t *GetFileMetaInformationVersion() 
-                     { return FileMetaInformationVersion;};
+                     { return FileMetaInformationVersion;}
    static void SetFileMetaInformationVersion( uint16_t fmiv )
-                     { FileMetaInformationVersion = (uint8_t *)&fmiv; };
+                     { FileMetaInformationVersion = (uint8_t *)&fmiv; }
 
 private:
    static std::string GetIPAddress(); //Do not expose this method