X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmUtil.h;h=d50b1e416c09fb8ace7328325210031aa102a94a;hb=da626417557034a6838c613ed1ccb1acc6864e9a;hp=325bde910b5bdf53f33cb03e3b8ce960b633d05c;hpb=541ed5b2824ff14630565a474b1406e58b677662;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 325bde91..d50b1e41 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,4 +1,4 @@
-// gdcmUtil.h
+// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.12 2003/06/26 13:07:01 jpr Exp $
 
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
@@ -7,7 +7,8 @@
 #include <vector>
 #include <string>
 #include "gdcmVR.h"
-using namespace std;
+#include "gdcmTS.h"
+#include "gdcmDictSet.h"
 
 class gdcmDebug {
 private:
@@ -15,27 +16,39 @@ private:
 public:
 	gdcmDebug(int  = 0);
 	void Verbose(int, const char*, const char* ="");
+//	void Verbose(int, char*, 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;}
 };
 
 class gdcmGlobal {
 private:
-   static gdcmVR *VR; 
+   static gdcmVR *VR;
+   static gdcmTS *TS; 
+   static gdcmDictSet *Dicts; 
 public:
    gdcmGlobal(void);
-   ~gdcmGlobal(void);
+   ~gdcmGlobal();
    static gdcmVR * GetVR(void);
+   static gdcmTS * GetTS(void);
+   static gdcmDictSet * GetDicts(void);
 };
 
-istream & eatwhite(istream & is);
+std::istream & eatwhite(std::istream & is);
 
-void Tokenize (const string& str,
-               vector<string>& tokens,
-               const string& delimiters = " ");
+void Tokenize (const std::string& str,
+               std::vector<std::string>& tokens,
+               const std::string& delimiters = " ");
 
 extern gdcmDebug dbg;
 
+char * _cleanString(char *v);
+char * _CreateCleanString(string s);
+
+std::string TranslateToKey(guint16 group, guint16 element);
+
 #endif
+