X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDict.cxx;h=7d9585cdc1ff65d78682e514fc8b91a5c5077eac;hb=c5618e6b8276e1b21bbea354fe8bcba3c78eb4bd;hp=c0fc1b2673c2d53784f771697d2141094917acc2;hpb=43cf193ac4e7395e1406e1867d76a6125c257a8b;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index c0fc1b26..7d9585cd 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -2,22 +2,15 @@ //----------------------------------------------------------------------------- #include "gdcmDict.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" #include #include #include -#ifdef GDCM_NO_ANSI_STRING_STREAM -# include -# define ostringstream ostrstream -# else -# include -#endif - //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmDict * \brief Construtor * @param FileName from which to build the dictionary. */ @@ -44,7 +37,7 @@ gdcmDict::gdcmDict(std::string & FileName) { name = buff; gdcmDictEntry * newEntry = new gdcmDictEntry(group, element, - vr, fourth, name); + vr, fourth, name); AddNewEntry(newEntry); } from.close(); @@ -53,7 +46,6 @@ gdcmDict::gdcmDict(std::string & FileName) { } /** - * \ingroup gdcmDict * \brief Destructor */ gdcmDict::~gdcmDict() { @@ -62,7 +54,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 +74,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,7 +93,6 @@ 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; @@ -131,13 +120,13 @@ void gdcmDict::PrintByName(std::ostream& os) { * \ingroup gdcmDict * \brief adds a new Dicom Dictionary Entry * @param NewEntry entry to add - * @return false if Dicom Element already existed + * @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());