* FIX : bug fix in the gdcmDirList for the recursivity in directories

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 7b35b952b6eb373fcfcc2944059f3cc54bb7ea97..dcc1068c516012b043028c48615f04f12eedd63f 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,9 +3,11 @@
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
+#include "gdcmCommon.h"
 #include "gdcmVR.h"
 #include "gdcmTS.h"
 #include "gdcmDictSet.h"
+#include "gdcmDicomDirElement.h"
 #include <iostream>
 #include <vector>
 #include <string>
@@ -23,7 +25,8 @@
  */
 class gdcmDebug {
 public:
-       gdcmDebug(int  = 0);
+       gdcmDebug(int level = GDCM_DEBUG);
+
        void SetDebug (int i) {DebugLevel = i;}
 
    void Verbose(int, const char*, const char* ="");
@@ -42,19 +45,21 @@ private:
  * 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);
+   static gdcmDictSet *GetDicts(void);
+   static gdcmVR *GetVR(void);
+   static gdcmTS *GetTS(void);
+   static gdcmDicomDirElement *GetDicomDirElements(void);
 
 private:
+   static gdcmDictSet *Dicts; 
    static gdcmVR *VR;
    static gdcmTS *TS; 
-   static gdcmDictSet *Dicts; 
+   static gdcmDicomDirElement *ddElem;
 };
 
 //-----------------------------------------------------------------------------
@@ -66,7 +71,7 @@ void Tokenize (const std::string& str,
 
 extern gdcmDebug dbg;
 
-char * _cleanString(char *v);
+char *_cleanString(char *v);
 std::string _CreateCleanString(std::string s);
 
 //-----------------------------------------------------------------------------