X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLEFramesInfo.cxx;h=189596db1740804240f9f442c0305f4640a07416;hb=b06cbd9177331d793223eac6bf8b2bccf874e7e3;hp=6f9aed23134f5141fad4b0942dca9ae92030a9b2;hpb=bd2c6b9f9fa4b815153b200081de0450429a882e;p=gdcm.git diff --git a/src/gdcmRLEFramesInfo.cxx b/src/gdcmRLEFramesInfo.cxx index 6f9aed23..189596db 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: 2007/05/23 14:18:11 $ + Version: $Revision: 1.22 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,10 +18,16 @@ #include "gdcmRLEFramesInfo.h" #include "gdcmDebug.h" +#include "gdcmUtil.h" -namespace gdcm -{ +#if defined(__BORLANDC__) + #include // for memset +#endif +namespace GDCM_NAME_SPACE +{ +//------------------------------------------------------------------------- +// Constructor / Destructor RLEFramesInfo::~RLEFramesInfo() { for(RLEFrameList::iterator it = Frames.begin(); it != Frames.end(); ++it) @@ -31,30 +37,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); @@ -82,124 +66,81 @@ RLEFrame *RLEFramesInfo::GetNextFrame() * \brief Reads from disk the Pixel Data of 'Run Length Encoded' * Dicom encapsulated file and decompress it. * @param fp already open File Pointer - * at which the pixel data should be copied + * from which the pixel data should be read + * @param raw raw + * @param xSize x Size + * @param ySize y Size + * @param zSize z Size + * @param tSize t 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 tSize, int bitsAllocated ) { uint8_t *subRaw = raw; - long RawSegmentSize = xSize * ySize; + long rawSegmentSize = xSize * ySize * tSize; // 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, tSize ); } 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. + * \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 tSize t Size + * @param numberOfFrames number of frames + * @return Boolean always true */ -bool RLEFramesInfo::ReadAndDecompressRLEFragment( uint8_t *subRaw, - long fragmentSize, - long RawSegmentSize, - std::ifstream *fp ) +bool RLEFramesInfo::ConvertRLE16BitsFromRLE8Bits(uint8_t *raw, int xSize, + int ySize, int tSize, + int numberOfFrames) { - 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 - */ -bool RLEFramesInfo::DecompressRLE16BitsFromRLE8Bits( uint8_t* raw, int xSize, int ySize,int numberOfFrames ) -{ - size_t pixelNumber = xSize * ySize; - size_t rawSize = xSize * ySize * numberOfFrames; + size_t pixelNumber = xSize * ySize * tSize; + size_t rawSize = pixelNumber * numberOfFrames * 2; // We assumed Raw contains the decoded RLE pixels but as // 8 bits per pixel. In order to convert those pixels to 16 bits // 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]; - memmove( copyRaw, raw, rawSize * 2 ); + uint8_t *copyRaw = new uint8_t[rawSize]; + memmove( copyRaw, raw, rawSize ); + + uint8_t *x = raw; + uint8_t *a; + uint8_t *b; - uint8_t* x = raw; - uint8_t* a = copyRaw; - uint8_t* b = a + pixelNumber; + // Warning : unckecked patch to see the behaviour on Big Endian Processors + if ( !Util::IsCurrentProcessorBigEndian() ) + { + a = copyRaw; // beginning of 'low bytes' + b = a + pixelNumber; // beginning of 'hight bytes' + } + else + { + b = copyRaw; // beginning of 'low bytes' + a = b + pixelNumber; // beginning of 'hight bytes' + } + + // Re order bytes for ( int i = 0; i < numberOfFrames; i++ ) { for ( unsigned int j = 0; j < pixelNumber; j++ ) @@ -210,10 +151,43 @@ bool RLEFramesInfo::DecompressRLE16BitsFromRLE8Bits( uint8_t* raw, int xSize, in } delete[] copyRaw; - - /// \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; + /// \todo : find an example, to know haow 3rd and 4th dimension + /// works together + for(RLEFrameList::iterator it = Frames.begin(); it != Frames.end(); ++it) + { + os << indent + << " frame number :" << frameNumber++ + << std::endl; + (*it)->Print( os, indent + " " ); + } +} +//----------------------------------------------------------------------------- } // end namespace gdcm