BUG: Fix declaration of vars within a switch/case

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 0804497e2ae466343e4db918a67c62c1c97b61fc..ea5a3170136ed8247ab085abb2a1a1e2a231520d 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/06/07 13:48:36 $
-  Version:   $Revision: 1.57 $
+  Date:      $Date: 2005/10/23 14:51:01 $
+  Version:   $Revision: 1.64 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,7 +26,7 @@
 namespace gdcm 
 {
 /**
- * \brief    Here are some utility functions, belonging to the Util class,
+ * \brief    Here are some utility functions, belonging to the gdcm::Util class,
  *           dealing with strings, file names... that can be called
  *           from anywhere by whomsoever they can help.
  */
@@ -41,15 +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();
+   /// 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 std::string GetMACAddress();
 
    static std::string CreateUniqueUID(const std::string &root = "");
@@ -65,10 +72,31 @@ public:
    static const std::string &GetRootUID();
 
    static const uint8_t *GetFileMetaInformationVersion() 
-                     { return FileMetaInformationVersion;};
-   static void SetFileMetaInformationVersion( uint16_t fmiv)
-                     { FileMetaInformationVersion = (uint8_t *)&fmiv; };
+                     { return FileMetaInformationVersion;}
+   static void SetFileMetaInformationVersion( uint16_t fmiv )
+                     { FileMetaInformationVersion = (uint8_t *)&fmiv; }
+
+// ----------------- to be removed later --------------------------     
+//To perform a full check of inline functions on all the platforms, 
+// we put here the two 'static' functions
+// hifpswap and  hNoifpswap in a .h
+// They will be remove ASAP
 
+   static inline void hifpswap(double *a, double *b)    
+   {
+      double tmp;
+      tmp = *a;
+      *a = *b;
+      *b = tmp;
+   }
+   static void hNoifpswap(double *a, double *b)    
+   {
+      double tmp;
+      tmp = *a;
+      *a = *b;
+      *b = tmp;
+   }    
+// ------------ end of functions to remove --------------------
 private:
    static std::string GetIPAddress(); //Do not expose this method