X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmBinEntry.cxx;h=37e9267fa3d44fafc10868d35623e77536c11281;hb=7350639601914cd8ab02bfb0d6668c5bf56ce2f4;hp=b560cc2cd0787d70b2c20f42c6172d6a94f0fd85;hpb=fea9426f960497d2d9124ab532d2097f2915678f;p=gdcm.git diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx index b560cc2c..37e9267f 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/10/22 03:05:40 $ - Version: $Revision: 1.34 $ + Date: $Date: 2005/02/01 10:29:54 $ + Version: $Revision: 1.60 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -17,38 +17,37 @@ =========================================================================*/ #include "gdcmBinEntry.h" +#include "gdcmContentEntry.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 BinEntry */ -BinEntry::BinEntry(DictEntry* e) : ValEntry(e) +BinEntry::BinEntry(DictEntry *e) : ContentEntry(e) { BinArea = 0; + SelfArea = true; } /** * \brief Constructor from a given BinEntry * @param e Pointer to existing Doc entry */ -BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry()) +BinEntry::BinEntry(DocEntry *e) : ContentEntry(e->GetDictEntry()) { - UsableLength = e->GetLength(); - ReadLength = e->GetReadLength(); - ImplicitVR = e->IsImplicitVR(); - Offset = e->GetOffset(); - PrintLevel = e->GetPrintLevel(); - //FIXME - //SQDepthLevel = e->GetDepthLevel(); + Copy(e); BinArea = 0; // let's be carefull ! + SelfArea = true; } /** @@ -56,22 +55,114 @@ BinEntry::BinEntry(DocEntry* e) : ValEntry(e->GetDictEntry()) */ BinEntry::~BinEntry() { - if (BinArea) + if (BinArea && SelfArea) { delete[] BinArea; BinArea = 0; // let's be carefull ! } } +//----------------------------------------------------------------------------- +// Public +/** + * \brief canonical Writer + * @param fp already open file pointer + * @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...) +*/ +void BinEntry::WriteContent(std::ofstream *fp, FileType filetype) +{ +#define BUFFER_SIZE 4096 + DocEntry::WriteContent(fp, filetype); + void* binArea = GetBinArea(); + int lgr = GetLength(); + if (binArea) // the binArea was *actually* loaded + { + + // 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 on 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 + fp->seekp(lgr, std::ios::cur); + } +} + +/** + * \brief Sets the value (non string) of the current Dicom Header Entry + */ +void BinEntry::SetBinArea( uint8_t *area, bool self ) +{ + if (BinArea && SelfArea) + delete[] BinArea; + + BinArea = area; + SelfArea=self; +} +//----------------------------------------------------------------------------- +// Protected + +//----------------------------------------------------------------------------- +// Private + //----------------------------------------------------------------------------- // Print -/* - * \brief canonical Printer +/** + * \brief Prints a BinEntry (Dicom entry) + * @param os ostream we want to print in + * @param indent Indentation string to be prepended during printing */ - -void BinEntry::Print(std::ostream &os) +void BinEntry::Print(std::ostream &os, std::string const & ) { + os << "B "; DocEntry::Print(os); std::ostringstream s; void* binArea = GetBinArea(); @@ -91,51 +182,10 @@ void BinEntry::Print(std::ostream &os) { //s << " [gdcm::Binary data NOT loaded]"; s << " [" <write ( (char*)binArea, lgr ); // Elem value - - } - else - { - // nothing was loaded, but we need to skip space on disc - fp->seekp(lgr, std::ios_base::cur); - } -} -//----------------------------------------------------------------------------- -// Public - - -/// \brief Sets the value (non string) of the current Dicom Header Entry -void BinEntry::SetBinArea( uint8_t* area ) -{ - if (BinArea) - delete[] BinArea; - BinArea = area; -} - -//----------------------------------------------------------------------------- -// Protected - -//----------------------------------------------------------------------------- -// Private - //----------------------------------------------------------------------------- } // end namespace gdcm