X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=e6543d8cd4a6f9c49e778380de2a58d356983760;hb=61e1a3e0ce5480990a0d0b844cf0e86d1775306d;hp=469247c6e7c209c292a84614905fb78e25e04596;hpb=bfbd90327a5e45d972546843b0d9e4185e16cb24;p=gdcm.git diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx index 469247c6..e6543d8c 100644 --- a/src/gdcmTS.cxx +++ b/src/gdcmTS.cxx @@ -1,22 +1,15 @@ // gdcmTS.cxx //----------------------------------------------------------------------------- #include +#include +#include #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 -#ifdef GDCM_NO_ANSI_STRING_STREAM -# include -# define ostringstream ostrstream -# else -# include -#endif //----------------------------------------------------------------------------- // Constructor / Destructor @@ -31,19 +24,8 @@ gdcmTS::gdcmTS(void) std::string name; while (!from.eof()) { - eatwhite(from); - from.getline(buff, 1024, ' '); - key = buff; - - 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 >> key; + getline(from, name); /// MEMORY LEAK if(key!="") {