X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmSQItem.cxx;h=d7c29e5e4e0aa9fee103be946285f5729072a93f;hb=1481a8c42f220e3ee882275bcf0b8cb1efd84cc5;hp=d7d0b19fe58f527802a47f232aa02610df650e1f;hpb=c42a0d560374ca98eb7f1531de835fd4cd1c59b0;p=gdcm.git diff --git a/src/gdcmSQItem.cxx b/src/gdcmSQItem.cxx index d7d0b19f..d7c29e5e 100644 --- a/src/gdcmSQItem.cxx +++ b/src/gdcmSQItem.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmSQItem.cxx,v $ Language: C++ - Date: $Date: 2004/10/27 22:31:12 $ - Version: $Revision: 1.32 $ + Date: $Date: 2004/11/04 15:08:50 $ + 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 @@ -27,7 +27,6 @@ namespace gdcm { - //----------------------------------------------------------------------------- // Constructor / Destructor /** @@ -49,7 +48,7 @@ SQItem::~SQItem() cc != DocEntries.end(); ++cc) { - delete (*cc); + delete *cc; } DocEntries.clear(); } @@ -70,7 +69,7 @@ SQItem::~SQItem() s << " | " ; } } - std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl; + //std::cout << s.str() << " --- SQItem number " << SQItemNumber << std::endl; for (ListDocEntry::iterator i = DocEntries.begin(); i != DocEntries.end(); ++i) @@ -99,12 +98,16 @@ SQItem::~SQItem() */ void SQItem::Write(std::ofstream* fp, FileType filetype) { + int j; uint16_t item[4] = { 0xfffe, 0xe000, 0xffff, 0xffff }; uint16_t itemt[4]= { 0xfffe, 0xe00d, 0xffff, 0xffff }; //we force the writting of an 'Item' Start Element // because we want to write the Item as a 'no Length' item - fp->write((char*)&item[0],8); // fffe e000 ffff ffff + for(j=0;j<4;++j) + { + binary_write( *fp, item[j]); // fffe e000 ffff ffff + } for (ListDocEntry::iterator i = DocEntries.begin(); i != DocEntries.end(); @@ -130,8 +133,11 @@ void SQItem::Write(std::ofstream* fp, FileType filetype) //we force the writting of an 'Item Delimitation' item // because we wrote the Item as a 'no Length' item - fp->write((char*)&itemt[0],8); // fffe e000 ffff ffff - + for(j=0;j<4;++j) + { + binary_write( *fp, itemt[j]); // fffe e000 ffff ffff + } + } //-----------------------------------------------------------------------------