Comments: It shouldn't be too difficult to 'manualy' ask memory merging

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 572171d0355c5e5ced296a2b7e370e1e5ab7bc4a..592f8b025a90b777e45a644fc127b59e3ed746b1 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/07/18 10:20:20 $
-  Version:   $Revision: 1.58 $
+  Date:      $Date: 2005/08/25 14:55:47 $
+  Version:   $Revision: 1.62 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -44,12 +44,18 @@ public:
                                       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();
+   /// Provides a simple static GetVersion() function
+   static std::string GetVersion() 
+                      { return GDCM_VERSION;}
    static unsigned int GetCurrentThreadID();
    static unsigned int GetCurrentProcessID();
    static bool         IsCurrentProcessorBigEndian();
@@ -57,7 +63,8 @@ public:
    static std::string DicomString(const char *s, size_t l);
    static std::string DicomString(const char *s);
    static bool        DicomStringEqual(const std::string &s1, const char *s2);
-   static bool        CompareDicomString(const std::string &s1, const char *s2, int op);
+   static bool        CompareDicomString(const std::string &s1, 
+                                         const char *s2, int op);
    static std::string GetMACAddress();
 
    static std::string CreateUniqueUID(const std::string &root = "");
@@ -65,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