X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmSeqEntry.cxx;h=fb0dfdfc2110af4526b38cd02d1ae2f2637a54ec;hb=d7531a8099267279c067b9115309cdc10f8eb46d;hp=615863efca6b641a4438396a97bb3b5d27d349a4;hpb=6b51b22366f878e1050c75a6ebb755bd2ff365c7;p=gdcm.git diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx index 615863ef..fb0dfdfc 100644 --- a/src/gdcmSeqEntry.cxx +++ b/src/gdcmSeqEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSeqEntry.cxx,v $ Language: C++ - Date: $Date: 2005/10/25 14:52:35 $ - Version: $Revision: 1.60 $ + Date: $Date: 2005/11/07 09:46:36 $ + Version: $Revision: 1.62 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -82,10 +82,11 @@ void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype) uint16_t seq_term_gr = 0xfffe; uint16_t seq_term_el = 0xe0dd; uint32_t seq_term_lg = 0xffffffff; - - //uint16_t item_term_gr = 0xfffe; - //uint16_t item_term_el = 0xe00d; - + + // ignore 'Zero length' Sequences + if ( GetReadLength() == 0 ) + return; + DocEntry::WriteContent(fp, filetype); for(ListSQItem::iterator cc = Items.begin(); cc != Items.end(); @@ -101,6 +102,23 @@ void SeqEntry::WriteContent(std::ofstream *fp, FileType filetype) binary_write(*fp, seq_term_lg); } +/** + * \brief Compute the full length of the SeqEntry (not only value + * length) depending on the VR. + */ +uint32_t SeqEntry::ComputeFullLength() +{ + uint32_t l = 12; // Tag (4) + VR (explicit) 4 + 4 (length); + for(ListSQItem::iterator cc = Items.begin(); + cc != Items.end(); + ++cc) + { + l += (*cc)->ComputeFullLength(); + } + l += 8; // seq_term Tag (4) + seq_term_lg (4) + return l; +} + /** * \brief adds the passed ITEM to the ITEM chained List for this SeQuence. * @param sqItem SQItem to be pushed back in the SeqEntry