forget this one

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 6332c43181be1d107368223eefe4349d3debdc99..d7857acbe1652e8ce364fe1acd32c5fc35fd82f0 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -18,7 +18,7 @@ gdcmBinEntry::gdcmBinEntry() : gdcmValEntry() {
  * \brief   Canonical destructor.
  */
 gdcmBinEntry::~gdcmBinEntry(){
-
+   free (voidArea);
 }
 
 
@@ -38,5 +38,5 @@ gdcmBinEntry::~gdcmBinEntry(){
 
 //-----------------------------------------------------------------------------
 // Private
-
+   
 //-----------------------------------------------------------------------------

diff --git a/src/gdcmBinEntry.h b/src/gdcmBinEntry.h
index e8beab61fcac6c3d90402df840188694caf7967a..c3254ad65949b2cedf433dea7745a80337141070 100644 (file)
--- a/src/gdcmBinEntry.h
+++ b/src/gdcmBinEntry.h
@@ -27,7 +27,7 @@ public:
    ///  when it's not string-translatable (e.g : a LUT table)         
    inline void *       GetVoidArea(void)  { return voidArea; };
 
-   /// Sets the value (non string) of the current Dicom Header Entry
+   /// \brief Sets the value (non string) of the current Dicom Header Entry
    inline void SetVoidArea(void * area)  { voidArea = area;  };
          
 protected:
@@ -35,19 +35,11 @@ protected:
 private:
 
 // Variables
-
    
    /// \brief unsecure memory area to hold 'non string' values 
    /// (ie : Lookup Tables, overlays, icons)   
    void *voidArea;
 
-
-
-
-
-
-
-
 };
 
 //-----------------------------------------------------------------------------

diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx
index c2d28100c29a6782af0472464bead2a45536e211..d60f1dbef0bd11bf39ea43d0728c6b58cd570bfd 100644 (file)
--- a/src/gdcmDocEntrySet.cxx
+++ b/src/gdcmDocEntrySet.cxx
@@ -2,9 +2,7 @@
 //-----------------------------------------------------------------------------
 //
 #include "gdcmDocEntrySet.h"
-
-#include <iomanip> // for std::ios::left, ...
-
+#include "gdcmException.h"
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -13,9 +11,12 @@
  * \brief   Constructor from a given gdcmDocEntrySet
  */
 gdcmDocEntrySet::gdcmDocEntrySet() {
-
 }
-
+/**
+ * \brief   Canonical destructor.
+ */
+gdcmDocEntrySet::~gdcmDocEntrySet(){
+}
 //-----------------------------------------------------------------------------
 // Print
 /*
@@ -37,13 +38,11 @@ gdcmDocEntrySet::gdcmDocEntrySet() {
 /**
  * \brief   Parses an EntrySet (Document header or SQ Item )
  * \       and load element values (a voir !)
- * @return  false if file is not ACR-NEMA / PAPYRUS / DICOM 
+ * @return  false anything wrong happens 
  */
-bool gdcmDocument::LoadDocEntrySet(bool exception_on_error) throw(gdcmFormatError) {
+bool gdcmDocEntrySet::LoadDocEntrySet(bool exception_on_error) 
+                   throw(gdcmFormatError) {
    (void)exception_on_error;
-   rewind(fp);
-   if (!CheckSwap())
-      return false;
 
    gdcmDocEntry  *newDocEntry = (gdcmDocEntry *)0;     
    gdcmValEntry  *newValEntry = (gdcmValEntry *)0; 

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 30f4f2e77ace78a17b6a67d7e4faac9c9dbf7d28..7ecee4e8e6927e87c3fdb6b6c848b11410d6fcd1 100644 (file)
--- a/src/gdcmDocEntrySet.h
+++ b/src/gdcmDocEntrySet.h
@@ -1,25 +1,28 @@
 // gdcmDocEntrySet.h
-
+//-----------------------------------------------------------------------------
 #ifndef GDCMDOCENTRYSET_H
 #define GDCMDOCENTRYSET_H
 
+#include "gdcmException.h"
+#include "gdcmDocEntry.h"
+
 //-----------------------------------------------------------------------------
 
-class GDCM_EXPORT gdcmDocEntrySet  {
+class GDCM_EXPORT gdcmDocEntrySet
+{
 
 public:
 
-
    gdcmDocEntrySet(void); 
    ~gdcmDocEntrySet(void);
 
-   void gdcmElementSet::FindDocEntryLength (gdcmDocEntry *Entry);
+   void FindDocEntryLength (gdcmDocEntry *Entry);
 
 protected:
 
 private:
 
-   bool gdcmDocEntrySet::LoadDocEntriesSet(bool exception_on_error = false) 
+   bool LoadDocEntrySet(bool exception_on_error = false) 
                      throw(gdcmFormatError);
 };
 

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 4af6b8f09ac7c4985863f694e8e3935973135b8f..7f87beacd41a43e9ed9bc2425fd49c6fcf86a883 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -68,6 +68,9 @@ gdcmDocument::gdcmDocument(const char *inFilename,
    if ( !OpenFile(exception_on_error))
       return;
 
+   rewind(fp); 
+   if (!CheckSwap()) 
+      return NULL; // Du menage à faire avant de sortir ?
    LoadDocEntries();   
    CloseFile();
 

diff --git a/src/gdcmSQItem.h b/src/gdcmSQItem.h
index 8ef543f30f55f093513768b316ff642c4bee2ee0..675492d56ac3f338d1eb11882c4f19fa604d018d 100644 (file)
--- a/src/gdcmSQItem.h
+++ b/src/gdcmSQItem.h
@@ -1,13 +1,17 @@
 // gdcmSQItem.h
-
+//-----------------------------------------------------------------------------
 #ifndef GDCMSQITEM_H
 #define GDCMSQITEM_H
 
+#include <list>
+
+#include "gdcmDocEntry.h"
+#include "gdcmDocEntrySet.h"
+
 //-----------------------------------------------------------------------------
 typedef std::list<gdcmDocEntry *> ListDocEntry;
 //-----------------------------------------------------------------------------
-
-class GDCM_EXPORT gdcmSQItem : public gdcmDocEntrySet 
+class GDCM_EXPORT gdcmSQItem : public gdcmDocEntrySet
 {
 public:
    gdcmSQItem(void);
@@ -20,7 +24,7 @@ public:
       {return docEntries;};   
    
  /// \brief   adds the passed DocEntry to the DocEntry chained List for this SQ Item.      
-   inline void AddDocEntry(DocEntry *e) 
+   inline void AddDocEntry(gdcmDocEntry *e) 
       {docEntries.push_back(e);};         
             
 protected:
@@ -31,7 +35,7 @@ private:
 // Variables
 
 /// \brief chained list of (Elementary) Doc Entries
-   ListDocEntry docEntries;
+  ListDocEntry docEntries;
 };
 
 

diff --git a/src/gdcmSeqEntry.h b/src/gdcmSeqEntry.h
index 7a818ef0838a63bf7a53279a20d88730a81f0c65..2c02597a8a8ecb5fcb18f651e077fba858bee574 100644 (file)
--- a/src/gdcmSeqEntry.h
+++ b/src/gdcmSeqEntry.h
@@ -3,6 +3,11 @@
 #ifndef GDCMSQDOCENTRY_H
 #define GDCMSQDOCENTRY_H
 
+#include <list>
+
+#include "gdcmSQItem.h"
+#include "gdcmDocEntry.h"
+
 //-----------------------------------------------------------------------------
 typedef std::list<gdcmSQItem *> ListSQItem;
 //-----------------------------------------------------------------------------

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index 132fe262a5cf231976cb91762d9d74e18da6d48b..c87f9e855c0780db635e675d1988f36ceeee3283 100644 (file)
--- a/src/gdcmValEntry.h
+++ b/src/gdcmValEntry.h
@@ -18,7 +18,6 @@ class GDCM_EXPORT gdcmValEntry  : public gdcmDocEntry {
 
 public:
 
-
    gdcmValEntry(void); 
    ~gdcmValEntry(void);