about compile errors

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 9d09f7ad7b37d5874edd3e66495e432afefde90a..6332c43181be1d107368223eefe4349d3debdc99 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -2,24 +2,24 @@
 //-----------------------------------------------------------------------------
 //
 #include "gdcmBinEntry.h"
-#include "gdcmTS.h"
-#include "gdcmGlobal.h"
-#include "gdcmUtil.h"
 
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
+
 /**
- * \ingroup gdcmBinEntry
  * \brief   Constructor from a given gdcmBinEntry
- * @param   in Pointer to existing dictionary entry
  */
-gdcmBinEntry::gdcmBinEntry() : gdcmDocEntry( ) {
-
+gdcmBinEntry::gdcmBinEntry() : gdcmValEntry() {
 
 }
 
+/**
+ * \brief   Canonical destructor.
+ */
+gdcmBinEntry::~gdcmBinEntry(){
 
+}
 
 
 //-----------------------------------------------------------------------------

diff --git a/src/gdcmBinEntry.h b/src/gdcmBinEntry.h
index 76569f538ea14bf74ce432f776209131558b2f87..e8beab61fcac6c3d90402df840188694caf7967a 100644 (file)
--- a/src/gdcmBinEntry.h
+++ b/src/gdcmBinEntry.h
@@ -6,6 +6,8 @@
 #include <iostream>
 #include <stdio.h>
 
+#include "gdcmValEntry.h"
+
 //-----------------------------------------------------------------------------
 /**
  * \ingroup gdcmBinEntry
@@ -17,6 +19,17 @@ class GDCM_EXPORT gdcmBinEntry  : public gdcmValEntry {
 
 public:
 
+   gdcmBinEntry(void); 
+   ~gdcmBinEntry(void);
+
+
+   /// \brief Returns the area value of the current Dicom Header Entry
+   ///  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
+   inline void SetVoidArea(void * area)  { voidArea = area;  };
+         
 protected:
 
 private:

diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx
index 7351409ed0b41e7bb137a86c9dcf4a97ea3dd473..8c50e202fdabb28348234144d4efea32abc01f09 100644 (file)
--- a/src/gdcmDocEntry.cxx
+++ b/src/gdcmDocEntry.cxx
@@ -30,6 +30,10 @@ gdcmDocEntry::gdcmDocEntry(gdcmDictEntry* in) {
  * \brief   canonical Printer
  */
 void gdcmDocEntry::Print(std::ostream & os) {
+
+// TODO : (no more chained list ...)
+
+/*
    size_t o;
    unsigned short int g, e;
    char st[20];
@@ -126,6 +130,8 @@ void gdcmDocEntry::Print(std::ostream & os) {
    }
    s << std::endl;
    os << s.str();
+   
+   */
 }
 
 //-----------------------------------------------------------------------------
@@ -153,13 +159,13 @@ guint32 gdcmDocEntry::GetFullLength(void) {
  * \brief   Copies all the attributes from an other DocEntry 
  */
 
-void Copy (gdcmDocEntry* e) {
-   this->entry = e->entry;
+void gdcmDocEntry::Copy (gdcmDocEntry* e) {
+   this->entry        = e->entry;
    this->UsableLength = e->UsableLength;
-   this->ReadLength = e->ReadLength;
-   this->ImplicitVR = e->ImplicitVR;
-   this->Offset = e->Offset;
-   this->printLevel = e->printLevel;
+   this->ReadLength   = e->ReadLength;
+   this->ImplicitVR   = e->ImplicitVR;
+   this->Offset       = e->Offset;
+   this->printLevel   = e->printLevel;
    this->SQDepthLevel = e->SQDepthLevel;      
 }
 

diff --git a/src/gdcmDocEntry.h b/src/gdcmDocEntry.h
index 18decf0168eecaca473ba4ff2c6ff84e4be25a6b..5f1094baf2cfdbd1d6f2597194ec6bc28d452e7b 100644 (file)
--- a/src/gdcmDocEntry.h
+++ b/src/gdcmDocEntry.h
@@ -37,15 +37,6 @@ public:
    /// Dictionnary, of the current Dicom Header Entry
    inline std::string  GetVR(void)        { return entry->GetVR();     };
 
-   /// \brief Returns the 'Value' (e.g. "Dupond Marcel") converted into a
-   /// 'string', if it's stored as an integer in the Dicom Header of the
-   /// current Dicom Header Entry
-   inline std::string  GetValue(void)     { return value;              };
-
-   /// \brief Returns the area value of the current Dicom Header Entry
-   ///  when it's not string-translatable (e.g : a LUT table)         
-   inline void *       GetVoidArea(void)  { return voidArea;           };
-
    /// \brief Returns offset (since the beginning of the file, including
    /// the File Pramble, if any) of the value of the current Dicom HeaderEntry
    /// \warning offset of the *value*, not of the Dicom Header Entry
@@ -78,12 +69,6 @@ public:
    /// \brief Sets only 'Usable Length' (*not* 'Read Length') of the current
    /// Dicom Header Entry
    inline void SetUsableLength(guint32 l) { UsableLength = l; }; 
-    
-   /// Sets the value (string) of the current Dicom Header Entry
-   inline void SetValue(std::string val) {  value = val; };
-
-   /// Sets the value (non string) of the current Dicom Header Entry
-   inline void SetVoidArea(void * area)  { voidArea = area;  };
    
    /// \brief   Sets the offset of the Dicom Element
    /// \warning use with caution !

diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx
index e0266a541f070c6da3e218ccb3287502dd9e47bc..c2d28100c29a6782af0472464bead2a45536e211 100644 (file)
--- a/src/gdcmDocEntrySet.cxx
+++ b/src/gdcmDocEntrySet.cxx
@@ -2,9 +2,6 @@
 //-----------------------------------------------------------------------------
 //
 #include "gdcmDocEntrySet.h"
-#include "gdcmTS.h"
-#include "gdcmGlobal.h"
-#include "gdcmUtil.h"
 
 #include <iomanip> // for std::ios::left, ...
 

diff --git a/src/gdcmDocEntrySet.h b/src/gdcmDocEntrySet.h
index 78375a3c730db497f87ac30c184b2c9462177804..30f4f2e77ace78a17b6a67d7e4faac9c9dbf7d28 100644 (file)
--- a/src/gdcmDocEntrySet.h
+++ b/src/gdcmDocEntrySet.h
@@ -5,17 +5,21 @@
 
 //-----------------------------------------------------------------------------
 
-class GDCM_EXPORT gdcmDocEntrySet 
-{
+class GDCM_EXPORT gdcmDocEntrySet  {
+
 public:
 
-void gdcmElementSet::FindDocEntryLength (gdcmDocEntry *Entry);
+
+   gdcmDocEntrySet(void); 
+   ~gdcmDocEntrySet(void);
+
+   void gdcmElementSet::FindDocEntryLength (gdcmDocEntry *Entry);
 
 protected:
 
 private:
 
-bool gdcmDocEntrySet::LoadDocEntriesSet(bool exception_on_error = false) 
+   bool gdcmDocEntrySet::LoadDocEntriesSet(bool exception_on_error = false) 
                      throw(gdcmFormatError);
 };
 

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index b40401fa87c42cb2090dcbbcf7c45873fb913e5c..132fe262a5cf231976cb91762d9d74e18da6d48b 100644 (file)
--- a/src/gdcmValEntry.h
+++ b/src/gdcmValEntry.h
@@ -6,6 +6,7 @@
 #include <iostream>
 #include <stdio.h>
 
+#include "gdcmDocEntry.h"
 //-----------------------------------------------------------------------------
 /**
  * \ingroup gdcmBinEntry
@@ -13,10 +14,22 @@
  *          (when successfuly parsed against a given Dicom dictionary)
  *          This one contains a 'non string' value
  */
-class GDCM_EXPORT gdcmDocEntry  : public gdcmValEntry {
+class GDCM_EXPORT gdcmValEntry  : public gdcmDocEntry {
 
 public:
 
+
+   gdcmValEntry(void); 
+   ~gdcmValEntry(void);
+
+   /// \brief Returns the 'Value' (e.g. "Dupond Marcel") converted into a
+   /// 'string', if it's stored as an integer in the Dicom Header of the
+   /// current Dicom Header Entry
+   inline std::string  GetValue(void)     { return value; };
+    
+   /// Sets the value (string) of the current Dicom Header Entry
+   inline void SetValue(std::string val)  { value = val;  };
+         
 protected:
 
 private:
@@ -33,7 +46,7 @@ private:
 
 
 
-
+};
 
 //-----------------------------------------------------------------------------
 #endif