X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=152aaebb91b9b4f7d09fbd995b4b02d9ab318513;hb=9f274230cc36f77f784729031fbe3e7d576f13ea;hp=0712d1db9705799b46dfdb7d8e15d63227a8f64d;hpb=8b0d3c6c373474dc31af9eb56cf949298a723a76;p=gdcm.git diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx index 0712d1db..152aaebb 100644 --- a/src/gdcmTS.cxx +++ b/src/gdcmTS.cxx @@ -1,5 +1,21 @@ -// gdcmTS.cxx -//----------------------------------------------------------------------------- +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmTS.cxx,v $ + Language: C++ + 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.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 #include #include @@ -19,18 +35,14 @@ gdcmTS::gdcmTS(void) 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; + from >> key; eatwhite(from); - from.getline(buff, 1024, '\n'); - name = buff; + std::getline(from, name); /// MEMORY LEAK if(key!="") { @@ -73,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]; }