Sub-minor fixes on std inclusion... JPR + Frog

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 9981e3677589fa31e81c5bd52e7b4102ccde259d..da2bf72bf6210aff623d8891bce5d6523e6ab569 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -119,18 +119,11 @@ gdcmDicomDir::gdcmDicomDir(bool exception_on_error):
    startArg=               NULL;
    progressArg=            NULL;
    endArg=                 NULL;
-cout << "gdcmDicomDir::gdcmDicomDir(bool exception_on_error) sortie gdcmDocument
-"
-<< endl;
    progress=0.0;
    abort=false;
    std::string pathBidon = ""; // Sorry, NULL not allowed ...
    SetElement(pathBidon, GDCM_DICOMDIR_META, NULL); // Set the META elements
-
-cout << "gdcmDicomDir::gdcmDicomDir apres  SetElement " << endl;  
    AddDicomDirMeta();
-       cout << "gdcmDicomDir::gdcmDicomDir apres  AddDicomDirMeta " << endl;  
-
 }
 
 

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 9a2164776c2948a31a9994d11961a46875040bd9..ba2a142a0d960392695889714f94956e0763d86f 100644 (file)
--- a/src/gdcmDocEntrySet.h
+++ b/src/gdcmDocEntrySet.h
@@ -16,18 +16,17 @@ public:
    gdcmDocEntrySet(int depth = 0); 
    ~gdcmDocEntrySet(void);
 
-/// \brief adds any type of entry to the entry set (pure vitual)
+   /// \brief adds any type of entry to the entry set (pure vitual)
    virtual bool AddEntry(gdcmDocEntry *Entry) = 0; // pure virtual
-
-//   bool CheckEntryVR(gdcmDocEntry *Entry, std::string vr);
+   //FIXME   bool CheckEntryVR(gdcmDocEntry *Entry, std::string vr);
         
-/// \brief prints any type of entry to the entry set (pure vitual)     
+   /// \brief prints any type of entry to the entry set (pure vitual)
    virtual void Print (std::ostream & os = std::cout) = 0;// pure virtual
 
    /// \brief Gets the depth level of a Dicom Header Entry embedded in a SeQuence
    inline int GetDepthLevel(void) 
       {return(SQDepthLevel);}
-               
+
    /// \brief Sets the depth level of a Dicom Header Entry embedded in a SeQuence
    inline void SetDepthLevel(int depth) 
       {SQDepthLevel = depth;}
@@ -51,7 +50,7 @@ protected:
 
    /// Gives the depth level of the element set inside SeQuences   
    int SQDepthLevel;
-                                                         
+
 private:
     
 };

diff --git a/src/gdcmDocument.h b/src/gdcmDocument.h
index fdab6009e393841e741ae7d26a00c9b1fcb8e2ee..27c611707f69bab510b65d18be56a4ad12058158 100644 (file)
--- a/src/gdcmDocument.h
+++ b/src/gdcmDocument.h
@@ -4,7 +4,6 @@
 #define GDCMDOCUMENT_H
 
 #include "gdcmCommon.h"
-
 #include "gdcmVR.h"
 #include "gdcmTS.h"
 #include "gdcmException.h"
@@ -260,7 +259,7 @@ public:
    /// Accessor to \ref filename
    inline void SetFileName(char* fileName) {filename = fileName;}
 
-   /// Accessor to \ref gdcmDocument::tagHT
+   /// Accessor to \ref gdcmElementSet::tagHT
    inline TagDocEntryHT &GetEntry(void) { return tagHT; };
 
    /// Accessor to \ref gdcmDocument::listEntries

diff --git a/src/gdcmElementSet.h b/src/gdcmElementSet.h
index 258e58dd243ed9186c423be40d56a6c1e0ed8a05..a410629e8a11ffa0d98638b19ef6323249492250 100644 (file)
--- a/src/gdcmElementSet.h
+++ b/src/gdcmElementSet.h
@@ -3,17 +3,16 @@
 #ifndef GDCMELEMENTSET_H
 #define GDCMELEMENTSET_H
 
+#include <map>
+#include <iostream>
+#include "gdcmCommon.h"
 #include "gdcmDocEntrySet.h"
-#include "gdcmDocEntry.h"
 
-#include <map>
-typedef std::string TagKey;
 typedef std::map<TagKey, gdcmDocEntry *> TagDocEntryHT;
 
-
 //-----------------------------------------------------------------------------
 
-class GDCM_EXPORT gdcmElementSet : public gdcmDocEntrySet 
+class GDCM_EXPORT gdcmElementSet : public gdcmDocEntrySet
 {
 public:
    gdcmElementSet(int);

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 237265b593fd2fef4190fdc217514ec5ec1a6d9c..dec2adf9b6b62d38c27a40c2cdc68e41cafec02d 100644 (file)
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -71,10 +71,11 @@ void gdcmSeqEntry::Print(std::ostream &os){
       os << s2.str();
       if (seq_term != NULL) {
          seq_term->Print(os);
-      }         
+      } 
       else 
-         std::cout << "      -------------- should have a sequence terminator item"
-                  << std::endl;      
+         std::cout
+             << "      -------------- should have a sequence terminator item"
+             << std::endl;      
    }                    
  }
 
@@ -104,15 +105,15 @@ void gdcmSeqEntry::SetDepthLevel(int depth) {
 gdcmDocEntry *gdcmSeqEntry::NewDocEntryByNumber(guint16 group,
                                                 guint16 element) {
 // TODO
-   std::cout << "TODO : gdcmSeqEntry::NewDocEntryByNumber " << endl;                             
+   std::cout << "TODO : gdcmSeqEntry::NewDocEntryByNumber " << std::endl;
    gdcmDocEntry *a;   
-   return a;                             
+   return a;
 }
 
 /// \brief to be written, if really usefull
 gdcmDocEntry *gdcmSeqEntry::NewDocEntryByName  (std::string Name) {
-// TODO        :                         
-   std::cout << "TODO : gdcmSeqEntry::NewDocEntryByName " << endl;                               
+// TODO
+   std::cout << "TODO : gdcmSeqEntry::NewDocEntryByName " << std::endl;
    gdcmDocEntry *a;   
    return a;   
 }
@@ -120,9 +121,9 @@ gdcmDocEntry *gdcmSeqEntry::NewDocEntryByName  (std::string Name) {
 /// \brief to be written, if really usefull
 gdcmDocEntry *gdcmSeqEntry::GetDocEntryByNumber(guint16 group,
                                                 guint16 element) {
-// TODO                                  
-   std::cout << "TODO : gdcmSeqEntry::GetDocEntryByNumber " << endl;                             
+// TODO
+   std::cout << "TODO : gdcmSeqEntry::GetDocEntryByNumber " << std::endl;
    gdcmDocEntry *a;   
-   return a;                             
-}      
+   return a;
+}
 //-----------------------------------------------------------------------------