X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmTS.cxx;h=4f87ab6c947e227336c747c8b05d9b47fd0363a3;hb=40b909789581894e57a0d8f22d6f1f91f55e7f84;hp=8946c61a9a95d6b47bbc2fc88ffc3f3bfabc68dc;hpb=0e82725d64f17545e782c18039ced7ea898f8cad;p=gdcm.git

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 8946c61a..4f87ab6c 100644
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -1,48 +1,52 @@
-// gdcmTS.cxx
-//-----------------------------------------------------------------------------
-#include <fstream>
-#include <string>
-#include <iostream>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmTS.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/10/12 04:35:48 $
+  Version:   $Revision: 1.26 $
+                                                                                
+  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>
 
+namespace gdcm 
+{
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
-gdcmTS::gdcmTS(void) 
+TS::TS() 
 {
-   std::string filename=gdcmDictSet::BuildDictPath() + std::string(DICT_TS);
+   std::string filename=DictSet::BuildDictPath() + std::string(DICT_TS);
    std::ifstream from(filename.c_str());
-   dbg.Error(!from, "gdcmTS::gdcmTS: can't open dictionary",filename.c_str());
+   dbg.Error(!from, "TS::TS: 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;
 
-      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;
       }
@@ -50,7 +54,8 @@ gdcmTS::gdcmTS(void)
    from.close();
 }
 
-gdcmTS::~gdcmTS() 
+//-----------------------------------------------------------------------------
+TS::~TS() 
 {
    ts.clear();
 }
@@ -58,11 +63,11 @@ gdcmTS::~gdcmTS()
 //-----------------------------------------------------------------------------
 // Print
 /**
- * \ingroup gdcmVR
+ * \ingroup VR
  * \brief   Print all 
  * @param   os The output stream to be written to.
  */
-void gdcmTS::Print(std::ostream &os) 
+void TS::Print(std::ostream &os) 
 {
    std::ostringstream s;
 
@@ -75,15 +80,17 @@ void gdcmTS::Print(std::ostream &os)
 
 //-----------------------------------------------------------------------------
 // Public
-int gdcmTS::Count(TSKey key) 
+int TS::Count(TSKey key) 
 {
    return ts.count(key);
 }
 
-std::string gdcmTS::GetValue(TSKey key) 
+std::string TS::GetValue(TSKey key) 
 {
-   if (ts.count(key) == 0) 
-      return (GDCM_UNFOUND);
+   if (ts.count(key) == 0)
+   {
+      return GDCM_UNFOUND;
+   }
    return ts[key];
 }
 
@@ -94,3 +101,5 @@ std::string gdcmTS::GetValue(TSKey key)
 // Private
 
 //-----------------------------------------------------------------------------
+
+} // end namespace gdcm