ENH: Backport change from ITK. Fix compilation warnings

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index 73fb51a..68f22e0 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/11 16:55:39 $
-  Version:   $Revision: 1.132 $
+  Date:      $Date: 2005/02/25 15:49:54 $
+  Version:   $Revision: 1.133 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -821,7 +821,6 @@ void DicomDir::SetElements(std::string const &path, VectDocument const &list)
          || first )
       {
          SetElement(path, GDCM_DICOMDIR_SERIE, *it);
-         first = true;
       }
       
       // Always Deal with 'IMAGE' Elements  

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 60f837e..a8e5903 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDictSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/05 01:37:08 $
-  Version:   $Revision: 1.60 $
+  Date:      $Date: 2005/02/25 15:49:54 $
+  Version:   $Revision: 1.61 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -164,7 +164,7 @@ Dict *DictSet::GetNextEntry()
 std::string DictSet::BuildDictPath() 
 {
    std::string resultPath;
-   const char *envPath = 0;
+   const char *envPath;
    envPath = getenv("GDCM_DICT_PATH");
 
    if (envPath && (strlen(envPath) != 0)) 

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index d756626..80c0484 100644 (file)
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/06 14:43:27 $
-  Version:   $Revision: 1.45 $
+  Date:      $Date: 2005/02/25 15:49:55 $
+  Version:   $Revision: 1.46 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -126,7 +126,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    // bility of your programs.
 
    struct stat buf;
-   dirent *d = 0;
+   dirent *d;
    for (d = readdir(dir); d; d = readdir(dir))
    {
       fileName = dirName + d->d_name;

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 0b90706..01300cb 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDocument.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/14 10:45:04 $
-  Version:   $Revision: 1.230 $
+  Date:      $Date: 2005/02/25 15:49:55 $
+  Version:   $Revision: 1.231 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -771,12 +771,12 @@ void Document::Initialize()
 void Document::ParseDES(DocEntrySet *set, long offset, 
                         long l_max, bool delim_mode)
 {
-   DocEntry *newDocEntry = 0;
+   DocEntry *newDocEntry;
    ValEntry *newValEntry;
    BinEntry *newBinEntry;
    SeqEntry *newSeqEntry;
    VRKey vr;
-   bool used = false;
+   bool used;
 
    while (true)
    {