X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDocEntry.cxx;h=db3461fe04fcf541021e1ba28cfa0065b0df53df;hb=ba8a9ca0672ca189114be7abdef289648fdfdef6;hp=0777f253782b470407d8f10d41fad627c03d9926;hpb=559c3639fc5b255b36a951f352db1addead9f78f;p=gdcm.git diff --git a/src/gdcmDocEntry.cxx b/src/gdcmDocEntry.cxx index 0777f253..db3461fe 100644 --- a/src/gdcmDocEntry.cxx +++ b/src/gdcmDocEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocEntry.cxx,v $ Language: C++ - Date: $Date: 2004/11/03 20:52:13 $ - Version: $Revision: 1.29 $ + Date: $Date: 2004/12/16 13:46:37 $ + Version: $Revision: 1.35 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,6 +18,7 @@ #include "gdcmDocEntry.h" #include "gdcmTS.h" +#include "gdcmVR.h" #include "gdcmGlobal.h" #include "gdcmUtil.h" @@ -43,6 +44,10 @@ DocEntry::DocEntry(DictEntry* in) DicomDict = in; SetKey( in->GetKey( ) ); Offset = 0 ; // To avoid further missprinting + + // init some variables + ReadLength = 0; + UsableLength = 0; } //----------------------------------------------------------------------------- @@ -54,18 +59,13 @@ DocEntry::DocEntry(DictEntry* in) */ void DocEntry::Print(std::ostream& os) { - PrintLevel = 2; // FIXME - size_t o; - unsigned short int g, e; std::string st; TSKey v; std::string d2, vr; std::ostringstream s; uint32_t lgth; - g = GetGroup(); - e = GetElement(); o = GetOffset(); vr = GetVR(); @@ -118,7 +118,7 @@ void DocEntry::Print(std::ostream& os) * @param fp already open file pointer * @param filetype type of the file to be written */ -void DocEntry::Write(std::ofstream* fp, FileType filetype) +void DocEntry::WriteContent(std::ofstream* fp, FileType filetype) { uint32_t ffff = 0xffffffff; uint16_t group = GetGroup(); @@ -244,12 +244,11 @@ uint32_t DocEntry::GetFullLength() */ void DocEntry::Copy (DocEntry* e) { - DicomDict = e->DicomDict; +// DicomDict = e->DicomDict; UsableLength = e->UsableLength; ReadLength = e->ReadLength; ImplicitVR = e->ImplicitVR; Offset = e->Offset; - PrintLevel = e->PrintLevel; // TODO : remove DocEntry SQDepth }