X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmElementSet.cxx;h=c476b0a5395284b2c8000dc1c789fb129fa93b20;hb=1771b10b3f1a4d6f96ea1869fb005f0d48b62eda;hp=a38db035db7714fc4e2410f55c7a5f6d29d0898c;hpb=66c8b2ef6c096d675afb963778604ed7ae72a78c;p=gdcm.git diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx index a38db035..c476b0a5 100644 --- a/src/gdcmElementSet.cxx +++ b/src/gdcmElementSet.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmElementSet.cxx,v $ Language: C++ - Date: $Date: 2007/07/26 08:36:49 $ - Version: $Revision: 1.77 $ + Date: $Date: 2007/08/29 15:30:49 $ + Version: $Revision: 1.78 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -49,10 +49,11 @@ ElementSet::~ElementSet() * @param fp ofstream to write to * @param filetype ExplicitVR/ImplicitVR/ACR/ACR_LIBIDO/JPEG/JPEG2000/... */ -void ElementSet::WriteContent(std::ofstream *fp, FileType filetype, bool dummy) +void ElementSet::WriteContent(std::ofstream *fp, FileType filetype, bool dummy, bool dummy2) { bool insideMetaElements = false; bool yetOutsideMetaElements = false; + int countSQ =0; for (TagDocEntryHT::const_iterator i = TagHT.begin(); i != TagHT.end(); @@ -87,9 +88,10 @@ void ElementSet::WriteContent(std::ofstream *fp, FileType filetype, bool dummy) ( (i->second)->GetGroup() == 0x0002 ||( (filetype == ACR || filetype == ACR_LIBIDO ) && (i->second)->GetGroup() == 0x0008 ) ) ) - { + { // There are DocEntries, written recursively - i->second->WriteContent(fp, filetype, insideMetaElements ); + // false : we are outside any Sequence + i->second->WriteContent(fp, filetype, insideMetaElements, false ); } } }