X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=82a25780a35fc20d3cf3cc8d0cc40e83b3331f31;hb=2231ee3a3a73117305f6dcbe90acf0b4aed24b3e;hp=630ed7c6916b3dc0c194754aff58c160309e85d5;hpb=19f72d139faa0f6a03f4e4a33be4c6b3e70b18b7;p=gdcm.git

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 630ed7c6..82a25780 100644
--- 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/23 03:36:24 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2004/10/08 04:43:38 $
+  Version:   $Revision: 1.25 $
                                                                                 
   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
@@ -16,36 +16,34 @@
                                                                                 
 =========================================================================*/
 
-#include <fstream>
-#include <string>
-#include <iostream>
-
 #include "gdcmTS.h"
 #include "gdcmDebug.h"
 #include "gdcmUtil.h"
 #include "gdcmDictSet.h"
 
-
+#include <fstream>
+#include <string>
+#include <iostream>
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
-gdcmTS::gdcmTS(void) 
+gdcmTS::gdcmTS() 
 {
    std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_TS);
    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;
 
-   while (!from.eof()) {
+   while (!from.eof())
+   {
       from >> key;
 
-      eatwhite(from);
-      getline(from, name);    /// MEMORY LEAK
+      from >> std::ws; // used to be eatwhite(from);
+      std::getline(from, name);    /// MEMORY LEAK
 
-      if(key!="") 
+      if(key!="")
       {
          ts[key]=name;
       }
@@ -53,6 +51,7 @@ gdcmTS::gdcmTS(void)
    from.close();
 }
 
+//-----------------------------------------------------------------------------
 gdcmTS::~gdcmTS() 
 {
    ts.clear();
@@ -85,8 +84,10 @@ int gdcmTS::Count(TSKey key)
 
 std::string gdcmTS::GetValue(TSKey key) 
 {
-   if (ts.count(key) == 0) 
+   if (ts.count(key) == 0)
+   {
       return GDCM_UNFOUND;
+   }
    return ts[key];
 }