X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=4c552409cfe2f191fbd439f1a60c207dde49d060;hb=d441f6f81784ccb09ce382c2eb574bc2b737cc6e;hp=2e4696258e524baddc8fd267ea68a42a12279ad5;hpb=15d7b1b38f5ddb59d395e0e4e3f9b0250eb90eec;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 2e469625..4c552409 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,5 +1,5 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.17 2004/01/12 13:12:28 regrain Exp $
-
+// gdcmUtil.h
+//-----------------------------------------------------------------------------
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
@@ -10,6 +10,7 @@
 #include <vector>
 #include <string>
 
+//-----------------------------------------------------------------------------
 /*
  * gdcmDebug is an object for debugging in program.
  * It has 2 debugging modes :
@@ -21,35 +22,42 @@
  * message level.
  */
 class gdcmDebug {
-private:
-	int DebugLevel;
 public:
 	gdcmDebug(int  = 0);
-	void Verbose(int, const char*, const char* ="");
+	void SetDebug (int i) {DebugLevel = i;}
+
+   void Verbose(int, const char*, const char* ="");
 	void Error(bool, const char*,  const char* ="");
 	void Error(const char*, const char* ="", const char* ="");
+
 	void Assert(int, bool, const char*, const char*);
 	void Exit(int);
-	void SetDebug (int i) {DebugLevel = i;}
+
+private:
+	int DebugLevel;
 };
 
+//-----------------------------------------------------------------------------
 /*
  * This class contains all globals elements that might be
  * instanciated only one time
  */
-class gdcmGlobal {
+class GDCM_EXPORT gdcmGlobal {
+public:
+   gdcmGlobal(void);
+   ~gdcmGlobal();
+
+   static gdcmVR *GetVR(void);
+   static gdcmTS *GetTS(void);
+   static gdcmDictSet *GetDicts(void);
+
 private:
    static gdcmVR *VR;
    static gdcmTS *TS; 
    static gdcmDictSet *Dicts; 
-public:
-   gdcmGlobal(void);
-   ~gdcmGlobal();
-   static gdcmVR * GetVR(void);
-   static gdcmTS * GetTS(void);
-   static gdcmDictSet * GetDicts(void);
 };
 
+//-----------------------------------------------------------------------------
 std::istream & eatwhite(std::istream & is);
 
 void Tokenize (const std::string& str,
@@ -58,10 +66,9 @@ void Tokenize (const std::string& str,
 
 extern gdcmDebug dbg;
 
-char * _cleanString(char *v);
+char *_cleanString(char *v);
 std::string _CreateCleanString(std::string s);
 
-std::string TranslateToKey(guint16 group, guint16 element);
-
+//-----------------------------------------------------------------------------
 #endif