X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=32c5f2854bee08d6b2111dfcc7afa58191e18b92;hb=e51bf0565bbe4c0e269dd941cb4071ebde6012e4;hp=3e218c41968260f8c01ffb1a2c64f84eea4f7f05;hpb=3e82e8b67eddf5d4b95b6aa2a2e2615aced4c452;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 3e218c41..32c5f285 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.cxx,v $ Language: C++ - Date: $Date: 2005/02/02 10:02:17 $ - Version: $Revision: 1.51 $ + Date: $Date: 2005/02/06 14:43:27 $ + Version: $Revision: 1.53 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -62,7 +62,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) uint16_t group = GetGroup(); VRKey vr = GetVR(); uint16_t el = GetElement(); - uint32_t lgr = GetLength(); + uint32_t lgth = GetLength(); if ( group == 0xfffe && el == 0x0000 ) { @@ -95,7 +95,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } uint16_t z = 0; - uint16_t shortLgr = lgr; + uint16_t shortLgr = lgth; if (vr == GDCM_UNKNOWN) { @@ -121,7 +121,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } else { - binary_write(*fp, lgr); + binary_write(*fp, lgth); } } else @@ -138,7 +138,7 @@ void DocEntry::WriteContent(std::ofstream *fp, FileType filetype) } else { - binary_write(*fp, lgr); + binary_write(*fp, lgth); } } } @@ -168,18 +168,6 @@ uint32_t DocEntry::GetFullLength() return l; } -/** - * \brief Copies all the attributes from an other DocEntry - * @param doc entry to copy from - */ -void DocEntry::Copy(DocEntry *doc) -{ - Length = doc->Length; - ReadLength = doc->ReadLength; - ImplicitVR = doc->ImplicitVR; - Offset = doc->Offset; -} - /** * \brief tells us if entry is the last one of a 'no length' SequenceItem * (fffe,e00d) @@ -198,6 +186,18 @@ bool DocEntry::IsSequenceDelimitor() return (GetGroup() == 0xfffe && GetElement() == 0xe0dd); } +/** + * \brief Copies all the attributes from an other DocEntry + * @param doc entry to copy from + */ +void DocEntry::Copy(DocEntry *doc) +{ + Length = doc->Length; + ReadLength = doc->ReadLength; + ImplicitVR = doc->ImplicitVR; + Offset = doc->Offset; +} + //----------------------------------------------------------------------------- // Protected