X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDict.cxx;h=6808a8d0b27778cf83e319aefdab33fc3c875b85;hb=8f95b22c9ddb93c38a7a844a1f003380075277b7;hp=0ac31dad235b477b46b125133ba213134d16ef69;hpb=10aa56aa534bae643e3833474a49309330235196;p=gdcm.git diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx index 0ac31dad..6808a8d0 100644 --- a/src/gdcmDict.cxx +++ b/src/gdcmDict.cxx @@ -1,5 +1,15 @@ // gdcmDict.cxx +//This is needed when compiling in debug mode +#ifdef _MSC_VER +// 'identifier' : class 'type' needs to have dll-interface to be used by +// clients of class 'type2' +#pragma warning ( disable : 4251 ) +// 'identifier' : identifier was truncated to 'number' characters in the +// debug information +#pragma warning ( disable : 4786 ) +#endif //_MSC_VER + #include #include "gdcmDict.h" #include "gdcmUtil.h" @@ -43,10 +53,8 @@ gdcmDict::gdcmDict(std::string & FileName) { /** * \ingroup gdcmDict * \brief - * @param - * @return */ - gdcmDict::~gdcmDict() { +gdcmDict::~gdcmDict() { for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag) { gdcmDictEntry* EntryToDelete = tag->second; if ( EntryToDelete ) @@ -54,7 +62,7 @@ gdcmDict::gdcmDict(std::string & FileName) { } KeyHt.clear(); // Since AddNewEntry adds symetrical in both KeyHt and NameHT we can - // assume all the pointed gdcmDictEntries are allready cleaned-up when + // assume all the pointed gdcmDictEntries are already cleaned-up when // we cleaned KeyHt. NameHt.clear(); } @@ -62,8 +70,7 @@ gdcmDict::gdcmDict(std::string & FileName) { /** * \ingroup gdcmDict * \brief - * @param - * @return + * @param os */ void gdcmDict::Print(std::ostream& os) { PrintByKey(os); @@ -132,7 +139,7 @@ gdcmDictEntry * gdcmDict::GetTagByName(TagName name) { /** * \ingroup gdcmDict * \brief - * @param + * @param NewEntry * @return */ int gdcmDict::ReplaceEntry(gdcmDictEntry* NewEntry) { @@ -146,7 +153,7 @@ int gdcmDict::ReplaceEntry(gdcmDictEntry* NewEntry) { /** * \ingroup gdcmDict * \brief - * @param + * @param NewEntry * @return */ int gdcmDict::AddNewEntry(gdcmDictEntry* NewEntry) { @@ -154,7 +161,7 @@ int gdcmDict::ReplaceEntry(gdcmDictEntry* NewEntry) { key = NewEntry->GetKey(); if(KeyHt.count(key) == 1) { - dbg.Verbose(1, "gdcmDict::AddNewEntry allready present", key.c_str()); + dbg.Verbose(1, "gdcmDict::AddNewEntry already present", key.c_str()); return(0); } else { KeyHt[NewEntry->GetKey()] = NewEntry; @@ -165,7 +172,7 @@ int gdcmDict::ReplaceEntry(gdcmDictEntry* NewEntry) { /** * \ingroup gdcmDict * \brief - * @param + * @param key * @return */ int gdcmDict::RemoveEntry(TagKey key) { @@ -184,7 +191,8 @@ int gdcmDict::RemoveEntry(TagKey key) { /** * \ingroup gdcmDict * \brief - * @param + * @param group + * @param element * @return */ int gdcmDict::RemoveEntry (guint16 group, guint16 element) {