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

[gdcm.git] / src / gdcmDictSet.cxx

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 24a3eafb1d5b8594283875f561dba91339925f4d..c26768c0861ad86e8f7cd9edd2a3499f8fb9a490 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -1,16 +1,26 @@
-// gdcmDictEntry
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDictSet.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/07/02 13:55:27 $
+  Version:   $Revision: 1.32 $
+                                                                                
+  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 "gdcmDictSet.h"
-#include "gdcmUtil.h"
+#include "gdcmDebug.h"
 #include <fstream>
 #include <stdlib.h>  // For getenv
 
-#define PUB_DICT_NAME     "DicomV3Dict"
-#ifndef PUB_DICT_PATH
-#  define PUB_DICT_PATH     "../Dicts/"
-#endif
-#define PUB_DICT_FILENAME "dicomV3.dic"
-
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 /** 
@@ -21,7 +31,8 @@
 gdcmDictSet::gdcmDictSet(void) 
 {
    DictPath = BuildDictPath();
-   std::string PubDictFile = DictPath + PUB_DICT_FILENAME;
+   std::string PubDictFile(DictPath);
+   PubDictFile += PUB_DICT_FILENAME;  /// MEMORY LEAK std::string::operator+=
    Dicts[PUB_DICT_NAME] = new gdcmDict(PubDictFile);
 }
 
@@ -85,8 +96,9 @@ std::list<std::string> *gdcmDictSet::GetPubDictEntryNames(void)
 
 /** 
  * \ingroup gdcmDictSet
- * \brief   - Consider all the entries of the public dicom dictionnary.
- *           Build an hashtable whose keys are the names of the groups
+ * \brief   
+ *          - Consider all the entries of the public dicom dictionnary.
+ *          - Build an hashtable whose keys are the names of the groups
  *           (fourth field in each line of dictionary) and whose corresponding
  *           values are lists of all the dictionnary entries among that
  *           group. Note that apparently the Dicom standard doesn't explicitely
@@ -145,7 +157,6 @@ gdcmDict *gdcmDictSet::GetDict(DictKey DictName)
 }
 
 /**
- * \ingroup gdcmDictSet
  * \brief   Retrieve the default reference DICOM V3 public dictionary.
  * \result  The retrieved default dictionary.
  */
@@ -155,17 +166,19 @@ gdcmDict *gdcmDictSet::GetDefaultPubDict()
 }
 
 /**
- * \ingroup gdcmDictSet
  * \brief   Create a gdcmDictEntry which will be reference 
  *          in no dictionnary
  * @return  virtual entry
  */
-gdcmDictEntry *gdcmDictSet::NewVirtualDictEntry(guint16 group, guint16 element,
-                                                std::string vr,std::string fourth,
+gdcmDictEntry *gdcmDictSet::NewVirtualDictEntry(uint16_t group,
+                                                uint16_t element,
+                                                std::string vr,
+                                                std::string fourth,
                                                 std::string name)
 {
-   gdcmDictEntry *entry;
-   std::string tag=gdcmDictEntry::TranslateToKey(group,element)+"#"+vr+"#"+fourth+"#"+name;
+   gdcmDictEntry* entry;
+   std::string tag = gdcmDictEntry::TranslateToKey(group,element)
+                     + "#" + vr + "#" + fourth + "#" + name;
    std::map<std::string,gdcmDictEntry *>::iterator it;
    
    it=virtualEntry.find(tag);
@@ -182,7 +195,6 @@ gdcmDictEntry *gdcmDictSet::NewVirtualDictEntry(guint16 group, guint16 element,
 }
 
 /**
- * \ingroup gdcmDictSet
  * \brief   Obtain from the GDCM_DICT_PATH environnement variable the
  *          path to directory containing the dictionnaries. When
  *          the environnement variable is absent the path is defaulted