Port Mathieu's modif from gdcm1.2

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index e6c0523913c1334044bf7642b851d055611517b4..c2e6a8abe0414100214a51c56ca17bfdc25c9d89 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: 2006/01/10 15:54:03 $
-  Version:   $Revision: 1.58 $
+  Date:      $Date: 2006/05/12 09:36:09 $
+  Version:   $Revision: 1.59 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -78,8 +78,7 @@ bool DirList::IsDirectory(std::string const &dirName)
    }
    else
    {
-      const char *str = strerror(errno);
-      gdcmStaticErrorMacro( str );
+      gdcmStaticErrorMacro( strerror(errno) );
       return false;
    }
 }
@@ -163,8 +162,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
       fileName = dirName + d->d_name;
       if( stat(fileName.c_str(), &buf) != 0 )
       {
-         const char *str = strerror(errno);
-         gdcmErrorMacro( str );
+         gdcmErrorMacro( strerror(errno) );
       }
       if ( S_ISREG(buf.st_mode) )    //is it a regular file?
       {
@@ -186,8 +184,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    }
    if( closedir(dir) != 0 )
    {
-      const char *str = strerror(errno);
-      gdcmErrorMacro( str );
+      gdcmErrorMacro( strerror(errno) );
    }
 #endif
 

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index 8ac4b2296ae0d43209ef487b7bfed0319bf1e90c..9ddb8a5739dd14ead91f8e00ad0fb713da913f23 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: 2006/05/05 22:13:55 $
-  Version:   $Revision: 1.347 $
+  Date:      $Date: 2006/05/12 09:37:45 $
+  Version:   $Revision: 1.348 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1064,7 +1064,7 @@ void Document::ParseDES(DocEntrySet *set, long offset,
    if( Debug::GetDebugFlag() )   
       std::cout << std::dec <<"(long)(Fp->tellg()) " << (long)(Fp->tellg()) // in Debug mode
                 << std::hex << " 0x(" <<(long)(Fp->tellg()) <<  ")" << std::endl;
-*/   
+ */ 
  
    // if ( !delim_mode && ((long)(Fp->tellg())-offset) >= l_max) // Once per DocEntry   
       if ( !delim_mode ) // 'and then' doesn't exist in C++ :-(
@@ -1803,6 +1803,7 @@ bool Document::IsDocEntryAnInteger(DocEntry *entry)
          // encounter such an ill-formed image, we simply display a warning
          // message and proceed on parsing (while crossing fingers).
          long filePosition = Fp->tellg(); // Only when elem 0x0000 length is not 4 (?!?)
+         (void)filePosition;
          gdcmWarningMacro( "Erroneous Group Length element length  on : (" 
            << std::hex << group << " , " << elem
            << ") -before- position x(" << filePosition << ")"