BUG: very same bug when using char* instead of string

[gdcm.git] / src / gdcmTS.cxx

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 7f5043856bc86ec21b918462549ad165bb5cd153..630ed7c6916b3dc0c194754aff58c160309e85d5 100644 (file)
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -1,43 +1,99 @@
-// gdcmTS.cxx
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmTS.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/06/23 03:36:24 $
+  Version:   $Revision: 1.21 $
+                                                                                
+  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.htm 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 <stdio.h>
+#include <fstream>
+#include <string>
+#include <iostream>
 
 #include "gdcmTS.h"
+#include "gdcmDebug.h"
+#include "gdcmUtil.h"
+#include "gdcmDictSet.h"
 
-gdcmTS::gdcmTS(void) {
-   ts["1.2.840.10008.1.2"]      = "Implicit VR - Little Endian";  
-   ts["1.2.840.10008.1.2.1"]    = "Explicit VR - Little Endian";         
-   ts["1.2.840.10008.1.2.1.99"] = "Deflated Explicit VR - Little Endian";          
-   ts["1.2.840.10008.1.2.2"]    = "Explicit VR - Big Endian";                 
-   ts["1.2.840.10008.1.2.4.50"] = "JPEG Baseline (Process 1)";       
-   ts["1.2.840.10008.1.2.4.51"] = "JPEG Extended (Process 2 & 4)";            
-   ts["1.2.840.10008.1.2.4.52"] = "JPEG Extended (Process 3 & 5)"; 
-   ts["1.2.840.10008.1.2.4.53"] = "JPEG Spectral Selection, Non-Hierarchical (Process 6 & 8)"; 
-   ts["1.2.840.10008.1.2.4.54"] = "JPEG Spectral Selection, Non-Hierarchical (Process 7 & 9)";        
-   ts["1.2.840.10008.1.2.4.55"] = "JPEG Spectral Selection, Non-Hierarchical (Process 10 & 12)";           
-   ts["1.2.840.10008.1.2.4.56"] = "JPEG Spectral Selection, Non-Hierarchical (Process 11 & 13)";             
-   ts["1.2.840.10008.1.2.4.57"] = "JPEG Baseline (Process 14)";     
-   ts["1.2.840.10008.1.2.4.58"] = "JPEG Baseline (Process 15)";     
-   ts["1.2.840.10008.1.2.4.59"] = "JPEG Spectral Selection, Non-Hierarchical (Process 16 & 18)";           
-   ts["1.2.840.10008.1.2.4.60"] = "JPEG Spectral Selection, Non-Hierarchical (Process 17 & 19)";          
-   ts["1.2.840.10008.1.2.4.61"] = "JPEG Spectral Selection, Non-Hierarchical (Process 20 & 22)";           
-   ts["1.2.840.10008.1.2.4.62"] = "JPEG Spectral Selection, Non-Hierarchical (Process 21 & 23)";          
-   ts["1.2.840.10008.1.2.4.63"] = "JPEG Spectral Selection, Non-Hierarchical (Process 24 & 26)";   
-   ts["1.2.840.10008.1.2.4.64"] = "JPEG Spectral Selection, Non-Hierarchical (Process 25 & 27)";   
-   ts["1.2.840.10008.1.2.4.65"] = "JPEG Lossless, Hierarchical (Process 28)";   
-   ts["1.2.840.10008.1.2.4.66"] = "JPEG Lossless, Hierarchical (Process 29)";   
-   ts["1.2.840.10008.1.2.4.70"] = "Non-Hierarchical, First-Order Prediction (Process 14 [Selection Value 1])"; 
-   ts["1.2.840.10008.1.2.5"]    = "RLE Lossless";              
+
+
+//-----------------------------------------------------------------------------
+// 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());
+
+   //char buff[1024];  //not used
+   std::string key;
+   std::string name;
+
+   while (!from.eof()) {
+      from >> key;
+
+      eatwhite(from);
+      getline(from, name);    /// MEMORY LEAK
+
+      if(key!="") 
+      {
+         ts[key]=name;
+      }
+   }
+   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
+
+//-----------------------------------------------------------------------------