ENH: Fix a shadow variable

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index de10fd2a9d84fb6e6ad0191ac489d75f7d29f90a..ef4f9652a9e15d54fb81badc6467b3c5849065e8 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 03:20:23 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2004/08/16 16:30:32 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,7 +28,7 @@
  */
 gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
 {
-   voidArea = NULL;
+   VoidArea = NULL;
 }
 
 /**
@@ -44,7 +44,7 @@ gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry())
    PrintLevel   = e->GetPrintLevel();
    SQDepthLevel = e->GetDepthLevel();
 
-   voidArea = NULL; // let's be carefull !
+   VoidArea = NULL; // let's be carefull !
 }
 
 /**
@@ -52,10 +52,10 @@ gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry())
  */
 gdcmBinEntry::~gdcmBinEntry()
 {
-   if (voidArea)
+   if (VoidArea)
    {
-      free (voidArea);
-      voidArea = NULL; // let's be carefull !
+      free (VoidArea);
+      VoidArea = NULL; // let's be carefull !
    }
 }
 

diff --git a/src/gdcmBinEntry.h b/src/gdcmBinEntry.h
index 8db65681770797bfda02f4ea5b11eb4c5dfb4f98..aa632e2814cafa0e59a6e08bb667f36972d19c17 100644 (file)
--- a/src/gdcmBinEntry.h
+++ b/src/gdcmBinEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmBinEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/07/02 13:55:27 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2004/08/16 16:30:32 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -31,24 +31,24 @@
  *          (when successfuly parsed against a given Dicom dictionary)
  *          This one contains a 'string value'.
  */
-class GDCM_EXPORT gdcmBinEntry  : public gdcmValEntry {
-
+class GDCM_EXPORT gdcmBinEntry  : public gdcmValEntry
+{
 public:
 
    gdcmBinEntry(gdcmDictEntry* e);
    gdcmBinEntry(gdcmDocEntry* d); 
 
-   ~gdcmBinEntry(void);
+   ~gdcmBinEntry();
    
    void Print(std::ostream &os = std::cout);
    virtual void Write(FILE*, FileType);
 
    /// \brief Returns the area value of the current Dicom Header Entry
    ///  when it's not string-translatable (e.g : a LUT table)         
-   void* GetVoidArea(void)  { return voidArea; };
+   void* GetVoidArea()  { return VoidArea; };
 
    /// \brief Sets the value (non string) of the current Dicom Header Entry
-   void SetVoidArea(void * area)  { voidArea = area;  };
+   void SetVoidArea(void * area)  { VoidArea = area;  };
          
 protected:
 
@@ -58,7 +58,7 @@ private:
    
    /// \brief unsecure memory area to hold 'non string' values 
    /// (ie : Lookup Tables, overlays, icons)   
-  // void *voidArea;
+  // void *VoidArea;
 
 };
 

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 3dd80953caa06389b42baaa21f9537ab9b645e4a..08d791e0952963edf3b80693baf736f574294ea8 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 03:20:23 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2004/08/16 16:30:32 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -32,7 +32,7 @@
  */
 gdcmValEntry::gdcmValEntry(gdcmDictEntry* e) : gdcmDocEntry(e)
 {
-   voidArea = NULL; // will be in BinEntry ?
+   VoidArea = NULL; // will be in BinEntry ?
 }
 
 /**
@@ -48,7 +48,7 @@ gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
    PrintLevel   = e->GetPrintLevel();
    SQDepthLevel = e->GetDepthLevel();
 
-   voidArea = NULL; // will be in BinEntry ?
+   VoidArea = NULL; // will be in BinEntry ?
 }
 
 
@@ -57,10 +57,10 @@ gdcmValEntry::gdcmValEntry(gdcmDocEntry* e) : gdcmDocEntry(e->GetDictEntry())
  */
 gdcmValEntry::~gdcmValEntry ()
 {
-   if (!voidArea)  // will be in BinEntry
+   if (!VoidArea)  // will be in BinEntry
    {
-      free(voidArea);
-      voidArea = NULL; // let's be carefull !
+      free(VoidArea);
+      VoidArea = NULL; // let's be carefull !
    }
 }
 

diff --git a/src/gdcmValEntry.h b/src/gdcmValEntry.h
index 79570c2578d257c1fcb92f3a4b87900df5e7fcac..f70ffd4f51ba8f7aeaa902fe4ce088dd5f9b92e3 100644 (file)
--- a/src/gdcmValEntry.h
+++ b/src/gdcmValEntry.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.h,v $
   Language:  C++
-  Date:      $Date: 2004/08/01 00:59:22 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2004/08/16 16:30:32 $
+  Version:   $Revision: 1.20 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -40,20 +40,20 @@ public:
    /// \brief Returns the 'Value' (e.g. "Dupond Marcel") converted into a
    /// 'string', if it's stored as an integer in the header of the
    /// current Dicom Document Entry
-   std::string GetValue() { return value; };
+   std::string GetValue() { return Value; };
     
    /// Sets the value (string) of the current Dicom Document Entry
-   void SetValue(std::string const & val) { value = val; };
+   void SetValue(std::string const & val) { Value = val; };
 
    /// Sets the value (void *) of the current Dicom Document Entry
-   void SetVoidArea(void * val) { voidArea = val; };
+   void SetVoidArea(void * val) { VoidArea = val; };
 
    virtual void Print(std::ostream &os = std::cout); 
    virtual void Write(FILE *fp, FileType filetype);
 
 protected:
    /// \brief for 'non string' values. Will be move to gdcmBinEntry, later
-   void* voidArea;  // clean it out later
+   void* VoidArea;  // clean it out later
    
 private:
 // Members :
@@ -61,7 +61,7 @@ private:
    /// \brief Document Entry value, internaly represented as a std::string
    ///        The Value Representation (\ref gdcmVR) is independently used
    ///        in order to interpret (decode) this field.
-   std::string  value;
+   std::string  Value;
 };
 
 //-----------------------------------------------------------------------------