X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLEFramesInfo.cxx;h=31f933f358c0b41fffc92354d5901bbe80ac4868;hb=25c9af365d9221bd45f3fbe27275ff0f66a265b1;hp=6f9aed23134f5141fad4b0942dca9ae92030a9b2;hpb=bd2c6b9f9fa4b815153b200081de0450429a882e;p=gdcm.git diff --git a/src/gdcmRLEFramesInfo.cxx b/src/gdcmRLEFramesInfo.cxx index 6f9aed23..31f933f3 100644 --- a/src/gdcmRLEFramesInfo.cxx +++ b/src/gdcmRLEFramesInfo.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmRLEFramesInfo.cxx,v $ Language: C++ - Date: $Date: 2005/01/31 05:24:21 $ - Version: $Revision: 1.9 $ + Date: $Date: 2005/02/02 10:16:02 $ + Version: $Revision: 1.14 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,7 +21,8 @@ namespace gdcm { - +//------------------------------------------------------------------------- +// Constructor / Destructor RLEFramesInfo::~RLEFramesInfo() { for(RLEFrameList::iterator it = Frames.begin(); it != Frames.end(); ++it) @@ -31,30 +32,8 @@ RLEFramesInfo::~RLEFramesInfo() Frames.clear(); } -/** - * \brief Print self. - * @param indent Indentation string to be prepended during printing. - * @param os Stream to print to. - */ -void RLEFramesInfo::Print( std::ostream &os, std::string indent ) -{ - os << std::endl; - os << indent - << "----------------- RLE frames --------------------------------" - << std::endl; - os << indent - << "Total number of Frames : " << Frames.size() - << std::endl; - int frameNumber = 0; - for(RLEFrameList::iterator it = Frames.begin(); it != Frames.end(); ++it) - { - os << indent - << " frame number :" << frameNumber++ - << std::endl; - (*it)->Print( os, indent + " " ); - } -} - +//----------------------------------------------------------------------------- +// Public void RLEFramesInfo::AddFrame(RLEFrame *frame) { Frames.push_back(frame); @@ -83,107 +62,47 @@ RLEFrame *RLEFramesInfo::GetNextFrame() * Dicom encapsulated file and decompress it. * @param fp already open File Pointer * at which the pixel data should be copied + * @param raw raw + * @param xSize x Size + * @param ySize y Size + * @param zSize z Size + * @param bitsAllocated Bits allocated * @return Boolean */ -bool RLEFramesInfo::ReadAndDecompressRLEFile( std::ifstream *fp , uint8_t *raw, int xSize, int ySize, int zSize, int bitsAllocated ) +bool RLEFramesInfo::DecompressRLEFile( std::ifstream *fp , uint8_t *raw, + int xSize, int ySize, int zSize, + int bitsAllocated ) { uint8_t *subRaw = raw; - long RawSegmentSize = xSize * ySize; + long rawSegmentSize = xSize * ySize; // Loop on the frame[s] for(RLEFrameList::iterator it = Frames.begin(); it != Frames.end(); ++it) { - // Loop on the fragments - for( unsigned int k = 1; k <= (*it)->GetNumberOfFragments(); k++ ) - { - fp->seekg((*it)->GetOffset(k),std::ios::beg); - ReadAndDecompressRLEFragment(subRaw, - (*it)->GetLength(k), - RawSegmentSize, - fp); - subRaw += RawSegmentSize; - } + subRaw = (*it)->ReadAndDecompressRLEFrame( subRaw, rawSegmentSize, fp); } if ( bitsAllocated == 16 ) { // Try to deal with RLE 16 Bits - (void)DecompressRLE16BitsFromRLE8Bits( raw, xSize, ySize, zSize ); + ConvertRLE16BitsFromRLE8Bits( raw, xSize, ySize, zSize ); } return true; } /** - * \brief Implementation of the RLE decoding algorithm for decompressing - * a RLE fragment. [refer to PS 3.5-2003, section G.3.2 p 86] - * @param subRaw Sub region of \ref Raw where the decoded fragment - * should be placed. - * @param fragmentSize The length of the binary fragment as found on the disk. - * @param RawSegmentSize The expected length of the fragment ONCE - * Raw. - * @param fp File Pointer: on entry the position should be the one of - * the fragment to be decoded. - */ -bool RLEFramesInfo::ReadAndDecompressRLEFragment( uint8_t *subRaw, - long fragmentSize, - long RawSegmentSize, - std::ifstream *fp ) -{ - int8_t count; - long numberOfOutputBytes = 0; - long numberOfReadBytes = 0; - - while( numberOfOutputBytes < RawSegmentSize ) - { - fp->read( (char*)&count, 1 ); - numberOfReadBytes += 1; - if ( count >= 0 ) - // Note: count <= 127 comparison is always true due to limited range - // of data type int8_t [since the maximum of an exact width - // signed integer of width N is 2^(N-1) - 1, which for int8_t - // is 127]. - { - fp->read( (char*)subRaw, count + 1); - numberOfReadBytes += count + 1; - subRaw += count + 1; - numberOfOutputBytes += count + 1; - } - else - { - if ( count <= -1 && count >= -127 ) - { - int8_t newByte; - fp->read( (char*)&newByte, 1); - numberOfReadBytes += 1; - for( int i = 0; i < -count + 1; i++ ) - { - subRaw[i] = newByte; - } - subRaw += -count + 1; - numberOfOutputBytes += -count + 1; - } - } - // if count = 128 output nothing - - if ( numberOfReadBytes > fragmentSize ) - { - gdcmVerboseMacro( "Read more bytes than the segment size."); - return false; - } - } - return true; -} - -/** - * \brief Try to deal with RLE 16 Bits. - * We assume the RLE has already been parsed and loaded in - * Raw (through \ref ReadAndDecompressJPEGFile ). - * We here need to make 16 Bits Pixels from Low Byte and - * High Byte 'Planes'...(for what it may mean) - * @return Boolean + * \brief We assume Raw contains the decoded RLE pixels but as + * 8 bits per pixel. We convert those pixels to 16 bits + * per pixel. + * @param raw raw + * @param xSize x Size + * @param ySize y Size + * @param numberOfFrames number of frames + * @return Boolean always true */ -bool RLEFramesInfo::DecompressRLE16BitsFromRLE8Bits( uint8_t* raw, int xSize, int ySize,int numberOfFrames ) +bool RLEFramesInfo::ConvertRLE16BitsFromRLE8Bits(uint8_t *raw, int xSize, + int ySize, int numberOfFrames) { size_t pixelNumber = xSize * ySize; size_t rawSize = xSize * ySize * numberOfFrames; @@ -193,12 +112,12 @@ bool RLEFramesInfo::DecompressRLE16BitsFromRLE8Bits( uint8_t* raw, int xSize, in // per pixel we cannot work in place within Raw and hence // we copy it in a safe place, say copyRaw. - uint8_t* copyRaw = new uint8_t[rawSize * 2]; + uint8_t *copyRaw = new uint8_t[rawSize * 2]; memmove( copyRaw, raw, rawSize * 2 ); - uint8_t* x = raw; - uint8_t* a = copyRaw; - uint8_t* b = a + pixelNumber; + uint8_t *x = raw; + uint8_t *a = copyRaw; + uint8_t *b = a + pixelNumber; for ( int i = 0; i < numberOfFrames; i++ ) { @@ -208,12 +127,44 @@ bool RLEFramesInfo::DecompressRLE16BitsFromRLE8Bits( uint8_t* raw, int xSize, in *(x++) = *(a++); } } - delete[] copyRaw; - - /// \todo check that operator new []didn't fail, and sometimes return false + + /// \todo check that operator new [] didn't fail, and sometimes return false + return true; } +//----------------------------------------------------------------------------- +// Protected + +//----------------------------------------------------------------------------- +// Private + +//----------------------------------------------------------------------------- +// Print +/** + * \brief Print self. + * @param indent Indentation string to be prepended during printing. + * @param os Stream to print to. + */ +void RLEFramesInfo::Print( std::ostream &os, std::string indent ) +{ + os << std::endl; + os << indent + << "----------------- RLE frames --------------------------------" + << std::endl; + os << indent + << "Total number of Frames : " << Frames.size() + << std::endl; + int frameNumber = 0; + for(RLEFrameList::iterator it = Frames.begin(); it != Frames.end(); ++it) + { + os << indent + << " frame number :" << frameNumber++ + << std::endl; + (*it)->Print( os, indent + " " ); + } +} +//----------------------------------------------------------------------------- } // end namespace gdcm