X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDefaultDicts.cxx.in;h=62fdb4e3514f406ca137a63e3c24104a2749bc77;hb=0bcc188c6d5185375f809253e8b9b97c856d2eac;hp=6418c31e46dbc2b5116dbdf452de16c9f861e3ab;hpb=bd1e1aea88a95e4d14cd59088a7e5280703402ea;p=gdcm.git diff --git a/src/gdcmDefaultDicts.cxx.in b/src/gdcmDefaultDicts.cxx.in index 6418c31e..62fdb4e3 100644 --- a/src/gdcmDefaultDicts.cxx.in +++ b/src/gdcmDefaultDicts.cxx.in @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDefaultDicts.cxx.in,v $ Language: C++ - Date: $Date: 2005/10/19 12:01:50 $ - Version: $Revision: 1.10 $ + Date: $Date: 2007/05/23 14:18:08 $ + Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -26,7 +26,7 @@ #include "gdcmDictGroupName.h" #include "gdcmDicomDirElement.h" -namespace gdcm +namespace GDCM_NAME_SPACE { typedef struct @@ -44,12 +44,14 @@ static DICT_ENTRY datadir[] = { void FillDefaultDataDict(Dict *d) { + DictEntry *e; unsigned int i = 0; DICT_ENTRY n = datadir[i]; while( n.name != 0 ) { - const DictEntry e( n.group, n.element, n.vr, n.vm, n.name); + e = DictEntry::New( n.group, n.element, n.vr, n.vm, n.name); d->AddEntry( e ); + e->Delete(); n = datadir[++i]; } } @@ -74,6 +76,8 @@ typedef struct const char *type; unsigned short group; unsigned short element; + //VRKey vr; + const char *vr; const char *value; } ELEMENT; @@ -91,7 +95,7 @@ void FillDefaultDIRDict(DicomDirElement *dde) while( e.type != 0 ) { - // Force to use the string comparision operator == + // Force to use the string comparison operator == strType = e.type; if( strType == "metaElem" ) type = DD_META; @@ -108,6 +112,7 @@ void FillDefaultDIRDict(DicomDirElement *dde) elem.Group = e.group; elem.Elem = e.element; + elem.VR = e.vr; elem.Value = e.value; dde->AddEntry( type, elem); e = dataElement[++i];