* In order to fix memory leaks:

[gdcm.git] / src / gdcmTS.cxx

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 29ab1be0a9c6d52731fd5d3e7ad488c765ccc785..e6543d8cd4a6f9c49e778380de2a58d356983760 100644 (file)
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -1,16 +1,20 @@
 // gdcmTS.cxx
-
+//-----------------------------------------------------------------------------
 #include <fstream>
+#include <string>
+#include <iostream>
 
 #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"
 
-gdcmTS::gdcmTS(void) {
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
+gdcmTS::gdcmTS(void) 
+{
    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());
@@ -20,14 +24,10 @@ gdcmTS::gdcmTS(void) {
    std::string name;
 
    while (!from.eof()) {
-      eatwhite(from);
-      from.getline(buff, 1024, ' ');
-      key = buff;
-      eatwhite(from);
-      from.getline(buff, 1024, '\n');
-      name = buff;
-
-      if(key!="")
+      from >> key;
+      getline(from, name);    /// MEMORY LEAK
+
+      if(key!="") 
       {
          ts[key]=name;
       }
@@ -35,16 +35,47 @@ gdcmTS::gdcmTS(void) {
    from.close();
 }
 
-gdcmTS::~gdcmTS() {
+gdcmTS::~gdcmTS() 
+{
    ts.clear();
 }
 
-int gdcmTS::Count(TSKey key) {
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \ingroup gdcmVR
+ * \brief   Print all 
+ * @param   os The output stream to be written to.
+ */
+void gdcmTS::Print(std::ostream &os) 
+{
+   std::ostringstream s;
+
+   for (TSHT::iterator it = ts.begin(); it != ts.end(); ++it)
+   {
+      s << "TS : "<<it->first<<" = "<<it->second<<std::endl;
+   }
+   os << s.str();
+}
+
+//-----------------------------------------------------------------------------
+// Public
+int gdcmTS::Count(TSKey key) 
+{
    return ts.count(key);
 }
 
-std::string gdcmTS::GetValue(TSKey key) {
+std::string gdcmTS::GetValue(TSKey key) 
+{
    if (ts.count(key) == 0) 
       return (GDCM_UNFOUND);
    return ts[key];
 }
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------