X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=7515f648d1ba0a5a2906fee9e3d922f13f04ebe1;hb=b868cc4addde15e2f692a7b1fe9451c1335258f4;hp=991d3a0149e05728575e31fdc384f668faf332a0;hpb=f5c7e83afd484a025285c64a09a89bd227087245;p=gdcm.git diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx index 991d3a01..7515f648 100644 --- a/src/gdcmBinEntry.cxx +++ b/src/gdcmBinEntry.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmBinEntry.cxx,v $ Language: C++ - Date: $Date: 2004/12/16 13:46:36 $ - Version: $Revision: 1.42 $ + Date: $Date: 2005/01/07 16:45:51 $ + Version: $Revision: 1.44 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -30,7 +30,7 @@ namespace gdcm /** * \brief Constructor from a given BinEntry */ -BinEntry::BinEntry(DictEntry* e) : ValEntry(e) +BinEntry::BinEntry(DictEntry *e) : ValEntry(e) { BinArea = 0; SelfArea = true; @@ -40,12 +40,14 @@ BinEntry::BinEntry(DictEntry* e) : ValEntry(e) * \brief Constructor from a given BinEntry * @param e Pointer to existing Doc entry */ -BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry()) +BinEntry::BinEntry(DocEntry *e) : ValEntry(e->GetDictEntry()) { - UsableLength = e->GetLength(); - ReadLength = e->GetReadLength(); - ImplicitVR = e->IsImplicitVR(); - Offset = e->GetOffset(); + Copy(e); +/* Length = e->GetLength(); + ReadLength = e->GetReadLength(); + ImplicitVR = e->IsImplicitVR(); + Offset = e->GetOffset();*/ + //FIXME //SQDepthLevel = e->GetDepthLevel(); @@ -105,7 +107,7 @@ void BinEntry::Print(std::ostream &os) * @param fp already open file pointer * @param filetype type of the file to be written */ -void BinEntry::WriteContent(std::ofstream* fp, FileType filetype) +void BinEntry::WriteContent(std::ofstream *fp, FileType filetype) { DocEntry::WriteContent(fp, filetype); void* binArea = GetBinArea(); @@ -114,8 +116,6 @@ void BinEntry::WriteContent(std::ofstream* fp, FileType filetype) { // there is a 'non string' LUT, overlay, etc fp->write ( (char*)binArea, lgr ); // Elem value - //assert( strlen((char*)binArea) == lgr ); - } else { @@ -128,7 +128,7 @@ void BinEntry::WriteContent(std::ofstream* fp, FileType filetype) /// \brief Sets the value (non string) of the current Dicom Header Entry -void BinEntry::SetBinArea( uint8_t* area, bool self ) +void BinEntry::SetBinArea( uint8_t *area, bool self ) { if (BinArea && SelfArea) delete[] BinArea;