ENH: Fix warnings about 'main' being used as local var... and replace tabs with two...

[gdcm.git] / src / gdcmTS.cxx

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 4a8fffbdf4b5c8886130d28357b139885d0b33ad..152aaebb91b9b4f7d09fbd995b4b02d9ab318513 100644 (file)
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmTS.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 13:47:33 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2004/09/27 08:39:07 $
+  Version:   $Revision: 1.24 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -35,7 +35,6 @@ gdcmTS::gdcmTS(void)
    std::ifstream from(filename.c_str());
    dbg.Error(!from, "gdcmTS::gdcmTS: can't open dictionary",filename.c_str());
 
-   //char buff[1024];  //not used
    std::string key;
    std::string name;
 
@@ -43,7 +42,7 @@ gdcmTS::gdcmTS(void)
       from >> key;
 
       eatwhite(from);
-      getline(from, name);    /// MEMORY LEAK
+      std::getline(from, name);    /// MEMORY LEAK
 
       if(key!="") 
       {
@@ -86,7 +85,7 @@ int gdcmTS::Count(TSKey key)
 std::string gdcmTS::GetValue(TSKey key) 
 {
    if (ts.count(key) == 0) 
-      return (GDCM_UNFOUND);
+      return GDCM_UNFOUND;
    return ts[key];
 }