X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=82a25780a35fc20d3cf3cc8d0cc40e83b3331f31;hb=67845c7dc1241480f5c5fcfa0cfc2e86918dad1e;hp=469247c6e7c209c292a84614905fb78e25e04596;hpb=bfbd90327a5e45d972546843b0d9e4185e16cb24;p=gdcm.git

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 469247c6..82a25780 100644
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -1,51 +1,49 @@
-// gdcmTS.cxx
-//-----------------------------------------------------------------------------
-#include <fstream>
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmTS.cxx,v $
+  Language:  C++
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 
 #include "gdcmTS.h"
+#include "gdcmDebug.h"
 #include "gdcmUtil.h"
+#include "gdcmDictSet.h"
 
-#ifndef PUB_DICT_PATH
-#  define PUB_DICT_PATH     "../Dicts/"
-#endif
-#define DICT_TS "dicomTS.dic"
-
+#include <fstream>
+#include <string>
 #include <iostream>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
 
 //-----------------------------------------------------------------------------
 // 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];
    std::string key;
    std::string name;
 
-   while (!from.eof()) {
-      eatwhite(from);
-      from.getline(buff, 1024, ' ');
-      key = buff;
+   while (!from.eof())
+   {
+      from >> key;
 
-      if(key.size()%2==1)
-      {
-      	key.resize(key.size()+1);
-         key[key.size()-1]=0;
-      }
-	
-      eatwhite(from);
-      from.getline(buff, 1024, '\n');
-      name = buff;
+      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) 
-      return (GDCM_UNFOUND);
+   if (ts.count(key) == 0)
+   {
+      return GDCM_UNFOUND;
+   }
    return ts[key];
 }