* src/gdcmFile.h : bug fix. Variable type and variable name had same name

   -- BeNours

diff --git a/ChangeLog b/ChangeLog
index ff46294c063bc72619809c0e1b85bf787ef25fc1..fd48dd6dcbc2cc0c1601d5128206c7b2073e605d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2004-12-04 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
    * Bug fix due my last commit (compilation under Windows).
    * Example/Volume2Dicom : bug fix in the file and reformatting source code
+   * src/gdcmFile.h : bug fix. Variable type and variable name had same name
 
 2004-12-03 Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
    * Huge cleanup:

diff --git a/gdcmPython/gdcm.i b/gdcmPython/gdcm.i
index 8b897682b924e08515f8813ce2f337a3b52d19fd..5c4dc258de8d097235a40e710543fe78d6e03566 100644 (file)
--- a/gdcmPython/gdcm.i
+++ b/gdcmPython/gdcm.i
@@ -140,8 +140,8 @@ using namespace gdcm;
       NewKey = PyString_FromString(RawName.c_str());
 
       // Element values are striped from leading/trailing spaces
-      if (gdcm::ValEntry* ValEntryPtr =
-                dynamic_cast< gdcm::ValEntry* >(tag->second) )
+         gdcm::ValEntry* ValEntryPtr = dynamic_cast< gdcm::ValEntry* >(tag->second);
+      if ( ValEntryPtr )
       {
          RawValue = ValEntryPtr->GetValue();
       }

diff --git a/src/gdcmFile.h b/src/gdcmFile.h
index 485bcf71f5d01d2d6297bc6b9e1cc7b16ab474d5..f72484188d77d0a8363eaa7d4f457398996aed20 100644 (file)
--- a/src/gdcmFile.h
+++ b/src/gdcmFile.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.h,v $
   Language:  C++
-  Date:      $Date: 2004/12/03 20:16:58 $
-  Version:   $Revision: 1.83 $
+  Date:      $Date: 2004/12/04 09:41:02 $
+  Version:   $Revision: 1.84 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,7 +38,7 @@ class DocEntryArchive;
 class GDCM_EXPORT File
 {
 public:
-   enum WriteMode
+   enum FileMode
    {
       WMODE_DECOMPRESSED,
       WMODE_RGB
@@ -78,8 +78,8 @@ public:
    // Write mode
    void SetWriteModeToDecompressed() { SetWriteMode(WMODE_DECOMPRESSED); };
    void SetWriteModeToRGB()          { SetWriteMode(WMODE_RGB); };
-   void SetWriteMode(WriteMode mode) { WriteMode = mode; };
-   WriteMode GetWriteMode()          { return WriteMode; };
+   void SetWriteMode(FileMode mode)  { WriteMode = mode; };
+   FileMode GetWriteMode()           { return WriteMode; };
 
    // Write format
    void SetWriteTypeToDcmImplVR()     { SetWriteType(ImplicitVR); };
@@ -137,7 +137,7 @@ private:
    DocEntryArchive *Archive;
 
    // Write variables
-   WriteMode WriteMode;
+   FileMode WriteMode;
    FileType WriteType;
 };
 } // end namespace gdcm