X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=19ac4d6553a8bfec46cb12edc0e5d934d1096a11;hb=c4eae790a08d862201d509f1224409358562b5f0;hp=47af8c38888458dcebd528afb2c88285982be9e6;hpb=692f863c018c259a380e664d3608a46ec0c8bb3e;p=gdcm.git diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx index 47af8c38..19ac4d65 100644 --- a/src/gdcmBinEntry.cxx +++ b/src/gdcmBinEntry.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmBinEntry.cxx,v $ Language: C++ - Date: $Date: 2004/09/23 09:40:30 $ - Version: $Revision: 1.29 $ + Date: $Date: 2005/01/16 04:50:41 $ + Version: $Revision: 1.53 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -19,44 +19,53 @@ #include "gdcmBinEntry.h" #include "gdcmDebug.h" +#include +#include +#include // for std::ios_base, since does not exist on gcc/Solaris + +namespace gdcm +{ //----------------------------------------------------------------------------- // Constructor / Destructor /** - * \brief Constructor from a given gdcmBinEntry + * \brief Constructor from a given BinEntry */ -gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e) +BinEntry::BinEntry(DictEntry *e) : ValEntry(e) { - VoidArea = 0; + BinArea = 0; + SelfArea = true; } /** - * \brief Constructor from a given gdcmBinEntry + * \brief Constructor from a given BinEntry * @param e Pointer to existing Doc entry */ -gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry()) +BinEntry::BinEntry(DocEntry *e) : ValEntry(e->GetDictEntry()) { - UsableLength = e->GetLength(); - ReadLength = e->GetReadLength(); - ImplicitVR = e->IsImplicitVR(); - Offset = e->GetOffset(); - PrintLevel = e->GetPrintLevel(); + Copy(e); +/* Length = e->GetLength(); + ReadLength = e->GetReadLength(); + ImplicitVR = e->IsImplicitVR(); + Offset = e->GetOffset();*/ + //FIXME //SQDepthLevel = e->GetDepthLevel(); - VoidArea = 0; // let's be carefull ! + BinArea = 0; // let's be carefull ! + SelfArea = true; } /** * \brief Canonical destructor. */ -gdcmBinEntry::~gdcmBinEntry() +BinEntry::~BinEntry() { - if (VoidArea) + if (BinArea && SelfArea) { - delete[] VoidArea; - VoidArea = 0; // let's be carefull ! + delete[] BinArea; + BinArea = 0; // let's be carefull ! } } @@ -67,12 +76,13 @@ gdcmBinEntry::~gdcmBinEntry() * \brief canonical Printer */ -void gdcmBinEntry::Print(std::ostream &os) +void BinEntry::Print(std::ostream &os, std::string const & ) { - gdcmDocEntry::Print(os); + os << "B "; + DocEntry::Print(os); std::ostringstream s; - void *voidArea = GetVoidArea(); - if (voidArea) + void* binArea = GetBinArea(); + if (binArea) { //s << " [" << GDCM_BINLOADED s << " [" << GetValue() @@ -99,20 +109,69 @@ void gdcmBinEntry::Print(std::ostream &os) * @param fp already open file pointer * @param filetype type of the file to be written */ -void gdcmBinEntry::Write(FILE *fp, FileType filetype) -{ - gdcmDocEntry::Write(fp, filetype); - void *voidArea = GetVoidArea(); +void BinEntry::WriteContent(std::ofstream *fp, FileType filetype) +{ +#define BUFFER_SIZE 4096 + DocEntry::WriteContent(fp, filetype); + void* binArea = GetBinArea(); int lgr = GetLength(); - if (voidArea) + if (binArea) // the binArea was *actually* loaded { - // there is a 'non string' LUT, overlay, etc - fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value + + // TODO FIME + // Probabely, the same operation will have to be done when we want + // to write image with Big Endian Transfert Syntax, + // and we are working onj Little Endian Processor + +#ifdef GDCM_WORDS_BIGENDIAN + // Be carefull with *any* 16 bits words 'binEntries !' + // if ( GetVR() == "OW") // to be used later + + // TODO FIXME Right now, we only care of Pixels element + + // 8 Bits Pixels *are* OB, 16 Bits Pixels *are* OW + // -value forced while Reading process- + if (GetGroup() == 0x7fe0 && GetVR() == "OW") + { + uint16_t *currPosition = (uint16_t *)binArea; + + // TODO FIXME : Maybe we should allocate somewhere a static buffer, + // in order not to have to alloc/delete for almost every BinEntry ... + uint16_t *buffer = new uint16_t[BUFFER_SIZE]; + + // how many BUFFER_SIZE long pieces in binArea ? + int nbPieces = lgr/BUFFER_SIZE/2; //(16 bits = 2 Bytes) + uint16_t *binArea16 = (uint16_t*)binArea; + for (int j=0;j> 8) | (binArea16[i] << 8); + } + fp->write ( (char*)currPosition, BUFFER_SIZE ); + currPosition += BUFFER_SIZE/2; + } + int remainingSize = lgr%BUFFER_SIZE; + if ( remainingSize != 0) + { + fp->write ( (char*)currPosition, remainingSize ); + } + delete[] buffer; + } + else + { + // For any other VR, BinEntry is re-written as-is + fp->write ( (char*)binArea, lgr ); + } +#else + fp->write ( (char*)binArea, lgr ); // Elem value +#endif //GDCM_WORDS_BIGENDIAN + } else { - // nothing was loaded, but we need to skip space on disc - fseek(fp,(size_t)lgr,SEEK_CUR); + // nothing was loaded, but we need to skip space on disc + fp->seekp(lgr, std::ios::cur); } } //----------------------------------------------------------------------------- @@ -120,11 +179,13 @@ void gdcmBinEntry::Write(FILE *fp, FileType filetype) /// \brief Sets the value (non string) of the current Dicom Header Entry -void gdcmBinEntry::SetVoidArea( uint8_t* area ) +void BinEntry::SetBinArea( uint8_t *area, bool self ) { - if (VoidArea) - delete[] VoidArea; - VoidArea = area; + if (BinArea && SelfArea) + delete[] BinArea; + + BinArea = area; + SelfArea=self; } //----------------------------------------------------------------------------- @@ -134,3 +195,4 @@ void gdcmBinEntry::SetVoidArea( uint8_t* area ) // Private //----------------------------------------------------------------------------- +} // end namespace gdcm