X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntrySet.cxx;h=fbc4764e0dd81562365854a9326319b6eb4373ec;hb=80075429b6ab9db9e885b9bb9ae1427530c7bef8;hp=05a552492a513c6c098c20d81ba7a173b530bb1f;hpb=17ebda2271dd65565f512e835546b22c22ebbbb0;p=gdcm.git diff --git a/src/gdcmDocEntrySet.cxx b/src/gdcmDocEntrySet.cxx index 05a55249..fbc4764e 100644 --- a/src/gdcmDocEntrySet.cxx +++ b/src/gdcmDocEntrySet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntrySet.cxx,v $ Language: C++ - Date: $Date: 2006/04/11 16:03:26 $ - Version: $Revision: 1.72 $ + Date: $Date: 2007/09/17 12:16:02 $ + Version: $Revision: 1.76 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -31,7 +31,7 @@ #include // for memset #endif -namespace gdcm +namespace GDCM_NAME_SPACE { //----------------------------------------------------------------------------- // Constructor / Destructor @@ -94,7 +94,7 @@ int DocEntrySet::GetEntryLength(uint16_t group, uint16_t elem) } /** - * \brief Same as \ref Document::GetDocEntry except it returns a result + * \brief Same as DocEntrySet::GetDocEntry except it returns a result * only when the corresponding entry is of type DataEntry. * @param group Group number of the searched Dicom Element * @param elem Element number of the searched Dicom Element @@ -110,7 +110,7 @@ DataEntry *DocEntrySet::GetDataEntry(uint16_t group, uint16_t elem) } /** - * \brief Same as \ref Document::GetDocEntry except it returns a result + * \brief Same as DocEntrySet::GetDocEntry except it returns a result * only when the corresponding entry is of type SeqEntry. * @param group Group number of the searched Dicom Element * @param elem Element number of the searched Dicom Element @@ -127,7 +127,7 @@ SeqEntry *DocEntrySet::GetSeqEntry(uint16_t group, uint16_t elem) /** * \brief Accesses an existing DocEntry (i.e. a Dicom Element) - * through it's (group, element) and modifies it's content with + * through its (group, element) and modifies its content with * the given value. * @param content new value (string) to substitute with * @param group group number of the Dicom Element to modify @@ -148,7 +148,7 @@ bool DocEntrySet::SetEntryString(std::string const &content, /** * \brief Accesses an existing DocEntry (i.e. a Dicom Element) - * through it's (group, element) and modifies it's content with + * through its (group, element) and modifies its content with * the given value. * @param content new value (void* -> uint8_t*) to substitute with * @param lgth new value length @@ -171,7 +171,7 @@ bool DocEntrySet::SetEntryBinArea(uint8_t *content, int lgth, /** * \brief Accesses an existing DocEntry (i.e. a Dicom Element) - * and modifies it's content with the given value. + * and modifies its content with the given value. * @param content new value (string) to substitute with * @param entry Entry to be modified */ @@ -187,7 +187,7 @@ bool DocEntrySet::SetEntryString(std::string const &content, DataEntry *entry) /** * \brief Accesses an existing DataEntry (i.e. a Dicom Element) - * and modifies it's content with the given value. + * and modifies its content with the given value. * @param content new value (void* -> uint8_t*) to substitute with * @param entry Entry to be modified * @param lgth new value length @@ -417,18 +417,16 @@ bool DocEntrySet::CheckIfEntryExist(uint16_t group, uint16_t elem ) /** * \brief Build a new DataEntry from all the low level arguments. - * Check for existence of dictionary entry, and build - * a default one when absent. * @param group Group number of the new Entry * @param elem Element number of the new Entry * @param vr V(alue) R(epresentation) of the new Entry * \remarks The user of this method must destroy the DataEntry when unused */ -DataEntry *DocEntrySet::NewDataEntry(uint16_t group,uint16_t elem, +DataEntry *DocEntrySet::NewDataEntry(uint16_t group, uint16_t elem, VRKey const &vr) { - DataEntry *newEntry = DataEntry::New(group,elem,vr); + DataEntry *newEntry = DataEntry::New(group, elem, vr); if (!newEntry) { gdcmWarningMacro( "Failed to allocate DataEntry for (" @@ -440,8 +438,6 @@ DataEntry *DocEntrySet::NewDataEntry(uint16_t group,uint16_t elem, /** * \brief Build a new SeqEntry from all the low level arguments. - * Check for existence of dictionary entry, and build - * a default one when absent. * @param group Group number of the new Entry * @param elem Element number of the new Entry * \remarks The user of this method must destroy the SeqEntry when unused @@ -451,7 +447,7 @@ SeqEntry* DocEntrySet::NewSeqEntry(uint16_t group, uint16_t elem) //DictEntry *dictEntry = GetDictEntry(group, elem, "SQ"); //SeqEntry *newEntry = SeqEntry::New( dictEntry ); - SeqEntry *newEntry = SeqEntry::New( group,elem ); + SeqEntry *newEntry = SeqEntry::New( group, elem ); //dictEntry->Unregister(); // GetDictEntry register it if (!newEntry) {