X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=b8ed20ab925be239a2c7979da54127a02cdb0678;hb=45a9005ae5c1975bbe932e43c8080a83c9daf29e;hp=e15c5ded5402c9fd9b3a8e0054f91f29f888ac68;hpb=d7a4d5d474ae599b723e52ebda8bd3fc6cee752a;p=gdcm.git

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index e15c5ded..b8ed20ab 100644
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -1,29 +1,38 @@
-// gdcmDict.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDict.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/06/22 13:47:33 $
+  Version:   $Revision: 1.37 $
+                                                                                
+  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 "gdcmDict.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
 
 #include <fstream>
 #include <iostream>
 #include <iomanip>
 
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmDict
  * \brief   Construtor
  * @param   FileName from which to build the dictionary.
  */
 gdcmDict::gdcmDict(std::string & FileName) {
    guint16 group, element;
-   char buff[1024];
+   //char buff[1024];
    TagName vr;
    TagName fourth;
    TagName name;
@@ -33,18 +42,16 @@ gdcmDict::gdcmDict(std::string & FileName) {
                     FileName.c_str());
 
    while (!from.eof()) {
-      from >> std::hex >> group >> element;
-      eatwhite(from);
-      from.getline(buff, 256, ' ');
-      vr = buff;
-      eatwhite(from);
-      from.getline(buff, 256, ' ');
-      fourth = buff;
-      from.getline(buff, 256, '\n');
-      name = buff;
+      from >> std::hex;
+      from >> group;          /// MEMORY LEAK in std::istream::operator>>
+      from >> element;
+      from >> vr;
+      from >> fourth;
+		eatwhite(from);
+      getline(from, name);    /// MEMORY LEAK in std::getline<>
 
       gdcmDictEntry * newEntry = new gdcmDictEntry(group, element,
-		                                   vr, fourth, name);
+                                                   vr, fourth, name);
       AddNewEntry(newEntry);
    }
    from.close();
@@ -53,7 +60,6 @@ gdcmDict::gdcmDict(std::string & FileName) {
 }
 
 /**
- * \ingroup gdcmDict
  * \brief  Destructor 
  */
 gdcmDict::~gdcmDict() {
@@ -62,7 +68,6 @@ gdcmDict::~gdcmDict() {
       if ( EntryToDelete )
          delete EntryToDelete;
    }
-
    // Since AddNewEntry adds symetrical in both KeyHt and NameHT we can
    // assume all the pointed gdcmDictEntries are already cleaned-up when
    // we cleaned KeyHt.
@@ -83,7 +88,6 @@ void gdcmDict::Print(std::ostream &os) {
 }
 
 /**
- * \ingroup gdcmDict
  * \brief   Print all the dictionary entries contained in this dictionary.
  *          Entries will be sorted by tag i.e. the couple (group, element).
  * @param   os The output stream to be written to.
@@ -103,10 +107,9 @@ void gdcmDict::PrintByKey(std::ostream &os) {
 }
 
 /**
- * \ingroup gdcmDict
  * \brief   Print all the dictionary entries contained in this dictionary.
  *          Entries will be sorted by the name of the dictionary entries.
- * \warning AVOID USING IT : the name IS NOT an identifier
+ * \warning AVOID USING IT : the name IS NOT an identifier; 
  *                           unpredictable result
  * @param   os The output stream to be written to.
  */
@@ -130,14 +133,14 @@ void gdcmDict::PrintByName(std::ostream& os) {
 /**
  * \ingroup gdcmDict
  * \brief  adds a new Dicom Dictionary Entry 
- * @param   NewEntry 
- * @return  false if Dicom Element already existed
+ * @param   NewEntry entry to add 
+ * @return  false if Dicom Element already exists
  */
 bool gdcmDict::AddNewEntry(gdcmDictEntry *NewEntry) 
 {
    TagKey key;
    key = NewEntry->GetKey();
-	
+
    if(KeyHt.count(key) == 1)
    {
       dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str());
@@ -146,7 +149,8 @@ bool gdcmDict::AddNewEntry(gdcmDictEntry *NewEntry)
    else 
    {
       KeyHt[NewEntry->GetKey()] = NewEntry;
-      NameHt[NewEntry->GetName()] = NewEntry;
+      NameHt[NewEntry->GetName()] = NewEntry;  /// MEMORY LEAK in
+                                               /// std::map<>::operator[]
       return(true);
    }
 }
@@ -154,7 +158,7 @@ bool gdcmDict::AddNewEntry(gdcmDictEntry *NewEntry)
 /**
  * \ingroup gdcmDict
  * \brief  replaces an already existing Dicom Element by a new one
- * @param   NewEntry
+ * @param   NewEntry new entry (overwrites any previous one with same tag)
  * @return  false if Dicom Element doesn't exist
  */
 bool gdcmDict::ReplaceEntry(gdcmDictEntry *NewEntry) {
@@ -198,8 +202,7 @@ bool gdcmDict::RemoveEntry(TagKey key)
 /**
  * \ingroup gdcmDict
  * \brief  removes an already existing Dicom Dictionary Entry, 
- *          identified by its group,element
- number
+ *          identified by its group,element number
  * @param   group   Dicom group number of the Dicom Element
  * @param   element Dicom element number of the Dicom Element
  * @return  false if Dicom Dictionary Entry doesn't exist
@@ -273,7 +276,7 @@ std::list<std::string> *gdcmDict::GetDictEntryNames(void)
  *           than asking us to perform a line by line check of the dictionnary
  *           at the beginning of each year to -try to- guess the changes)
  *           Therefore : please NEVER use that fourth field :-(
- * *
+ *
  * @return  An hashtable: whose keys are the names of the groups and whose
  *          corresponding values are lists of all the dictionnary entries
  *          among that group.