X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.cxx;h=8048fbab973366e52aa6191c59c46c40dc4c158d;hb=cfd7023dd0efe6d0cf17cdc1b31bbf17ac8a9ade;hp=1439cdefbc5250267b30a5e6c3a9b4abb9976bb2;hpb=7ffa5a65da43145ef4cfe6a1bbd413842f7ee94e;p=gdcm.git diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index 1439cdef..8048fbab 100644 --- a/src/gdcmPixelReadConvert.cxx +++ b/src/gdcmPixelReadConvert.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmPixelReadConvert.cxx,v $ Language: C++ - Date: $Date: 2004/12/14 08:31:30 $ - Version: $Revision: 1.10 $ + Date: $Date: 2005/01/17 03:05:55 $ + Version: $Revision: 1.30 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,6 +24,8 @@ #include "gdcmDebug.h" #include "gdcmHeader.h" +#include "gdcmGlobal.h" +#include "gdcmTS.h" #include "gdcmPixelReadConvert.h" #include "gdcmDocEntry.h" #include "gdcmRLEFramesInfo.h" @@ -36,30 +38,6 @@ namespace gdcm { #define str2num(str, typeNum) *((typeNum *)(str)) -// For JPEG 2000, body in file gdcmJpeg2000.cxx -bool gdcm_read_JPEG2000_file (std::ifstream* fp, void* image_buffer); - -#define JOCTET uint8_t -// For JPEG 8 Bits, body in file gdcmJpeg8.cxx -bool gdcm_read_JPEG_file8 (std::ifstream* fp, void* image_buffer); -bool gdcm_read_JPEG_memory8 (const JOCTET* buffer, const size_t buflen, - void* image_buffer, - size_t *howManyRead, size_t *howManyWritten); -// -// For JPEG 12 Bits, body in file gdcmJpeg12.cxx -bool gdcm_read_JPEG_file12 (std::ifstream* fp, void* image_buffer); -bool gdcm_read_JPEG_memory12 (const JOCTET *buffer, const size_t buflen, - void* image_buffer, - size_t *howManyRead, size_t *howManyWritten); - -// For JPEG 16 Bits, body in file gdcmJpeg16.cxx -// Beware this is misleading there is no 16bits DCT algorithm, only -// jpeg lossless compression exist in 16bits. -bool gdcm_read_JPEG_file16 (std::ifstream* fp, void* image_buffer); -bool gdcm_read_JPEG_memory16 (const JOCTET *buffer, const size_t buflen, - void* image_buffer, - size_t *howManyRead, size_t *howManyWritten); - //----------------------------------------------------------------------------- // Constructor / Destructor @@ -121,7 +99,7 @@ void PixelReadConvert::AllocateRaw() * \brief Read from file a 12 bits per pixel image and decompress it * into a 16 bits per pixel image. */ -void PixelReadConvert::ReadAndDecompress12BitsTo16Bits( std::ifstream* fp ) +void PixelReadConvert::ReadAndDecompress12BitsTo16Bits( std::ifstream *fp ) throw ( FormatError ) { int nbPixels = XSize * YSize; @@ -167,7 +145,7 @@ void PixelReadConvert::ReadAndDecompress12BitsTo16Bits( std::ifstream* fp ) /** * \brief Try to deal with RLE 16 Bits. - * We assume the RLE has allready been parsed and loaded in + * 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) @@ -175,24 +153,24 @@ void PixelReadConvert::ReadAndDecompress12BitsTo16Bits( std::ifstream* fp ) */ bool PixelReadConvert::DecompressRLE16BitsFromRLE8Bits( int NumberOfFrames ) { - size_t PixelNumber = XSize * YSize; - size_t RawSize = XSize * YSize * NumberOfFrames; + size_t pixelNumber = XSize * YSize; + size_t rawSize = XSize * YSize * NumberOfFrames; // 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 * 2 ]; + memmove( copyRaw, Raw, rawSize * 2 ); uint8_t* x = Raw; uint8_t* a = copyRaw; - uint8_t* b = a + PixelNumber; + uint8_t* b = a + pixelNumber; for ( int i = 0; i < NumberOfFrames; i++ ) { - for ( unsigned int j = 0; j < PixelNumber; j++ ) + for ( unsigned int j = 0; j < pixelNumber; j++ ) { *(x++) = *(b++); *(x++) = *(a++); @@ -216,10 +194,10 @@ bool PixelReadConvert::DecompressRLE16BitsFromRLE8Bits( int NumberOfFrames ) * @param fp File Pointer: on entry the position should be the one of * the fragment to be decoded. */ -bool PixelReadConvert::ReadAndDecompressRLEFragment( uint8_t* subRaw, +bool PixelReadConvert::ReadAndDecompressRLEFragment( uint8_t *subRaw, long fragmentSize, long RawSegmentSize, - std::ifstream* fp ) + std::ifstream *fp ) { int8_t count; long numberOfOutputBytes = 0; @@ -259,8 +237,7 @@ bool PixelReadConvert::ReadAndDecompressRLEFragment( uint8_t* subRaw, if ( numberOfReadBytes > fragmentSize ) { - dbg.Verbose(0, "PixelReadConvert::ReadAndDecompressRLEFragment: we " - "read more bytes than the segment size."); + gdcmVerboseMacro( "Read more bytes than the segment size."); return false; } } @@ -274,9 +251,9 @@ bool PixelReadConvert::ReadAndDecompressRLEFragment( uint8_t* subRaw, * at which the pixel data should be copied * @return Boolean */ -bool PixelReadConvert::ReadAndDecompressRLEFile( std::ifstream* fp ) +bool PixelReadConvert::ReadAndDecompressRLEFile( std::ifstream *fp ) { - uint8_t* subRaw = Raw; + uint8_t *subRaw = Raw; long RawSegmentSize = XSize * YSize; // Loop on the frame[s] @@ -315,14 +292,11 @@ void PixelReadConvert::ConvertSwapZone() if( BitsAllocated == 16 ) { - uint16_t* im16 = (uint16_t*)Raw; + uint16_t *im16 = (uint16_t*)Raw; switch( SwapCode ) { - case 0: - case 12: case 1234: break; - case 21: case 3412: case 2143: case 4321: @@ -332,8 +306,7 @@ void PixelReadConvert::ConvertSwapZone() } break; default: - dbg.Verbose( 0, "PixelReadConvert::ConvertSwapZone: SwapCode value " - "(16 bits) not allowed." ); + gdcmVerboseMacro("SwapCode value (16 bits) not allowed."); } } else if( BitsAllocated == 32 ) @@ -344,7 +317,6 @@ void PixelReadConvert::ConvertSwapZone() uint32_t* im32 = (uint32_t*)Raw; switch ( SwapCode ) { - case 0: case 1234: break; case 4321: @@ -379,8 +351,7 @@ void PixelReadConvert::ConvertSwapZone() } break; default: - dbg.Verbose( 0, "PixelReadConvert::ConvertSwapZone: SwapCode value " - "(32 bits) not allowed." ); + gdcmVerboseMacro("SwapCode value (32 bits) not allowed." ); } } } @@ -396,9 +367,9 @@ void PixelReadConvert::ConvertReorderEndianity() } // Special kludge in order to deal with xmedcon broken images: - if ( ( BitsAllocated == 16 ) - && ( BitsStored < BitsAllocated ) - && ( ! PixelSign ) ) + if ( BitsAllocated == 16 + && BitsStored < BitsAllocated + && !PixelSign ) { int l = (int)( RawSize / ( BitsAllocated / 8 ) ); uint16_t *deb = (uint16_t *)Raw; @@ -416,59 +387,30 @@ void PixelReadConvert::ConvertReorderEndianity() /** * \brief Reads from disk the Pixel Data of JPEG Dicom encapsulated - * file and decompress it. This funciton assumes that each + * file and decompress it. This function assumes that each * jpeg fragment contains a whole frame (jpeg file). * @param fp File Pointer * @return Boolean */ -bool PixelReadConvert::ReadAndDecompressJPEGFramesFromFile( std::ifstream* fp ) +bool PixelReadConvert::ReadAndDecompressJPEGFramesFromFile( std::ifstream *fp ) { - uint8_t* localRaw = Raw; + // Pointer to the Raw image + uint8_t *localRaw = Raw; + + // Precompute the offset localRaw will be shifted with + int length = XSize * YSize * SamplesPerPixel; + int numberBytes = BitsAllocated / 8; + // Loop on the fragment[s] for( JPEGFragmentsInfo::JPEGFragmentsList::iterator it = JPEGInfo->Fragments.begin(); it != JPEGInfo->Fragments.end(); ++it ) { - fp->seekg( (*it)->Offset, std::ios::beg); - - if ( BitsStored == 8) - { - // JPEG Lossy : call to IJG 6b - if ( ! gdcm_read_JPEG_file8( fp, localRaw ) ) - { - return false; - } - } - else if ( BitsStored <= 12) - { - // Reading Fragment pixels - if ( ! gdcm_read_JPEG_file12 ( fp, localRaw ) ) - { - return false; - } - } - else if ( BitsStored <= 16) - { - // Reading Fragment pixels - if ( ! gdcm_read_JPEG_file16 ( fp, localRaw ) ) - { - return false; - } - //assert( IsJPEGLossless ); - } - else - { - // other JPEG lossy not supported - dbg.Error("PixelReadConvert::ReadAndDecompressJPEGFile: unknown " - "jpeg lossy compression "); - return false; - } + (*it)->DecompressJPEGFramesFromFile(fp, localRaw, BitsStored ); // Advance to next free location in Raw // for next fragment decompression (if any) - int length = XSize * YSize * SamplesPerPixel; - int numberBytes = BitsAllocated / 8; localRaw += length * numberBytes; } @@ -485,81 +427,19 @@ bool PixelReadConvert::ReadAndDecompressJPEGFramesFromFile( std::ifstream* fp ) * @return Boolean */ bool PixelReadConvert:: -ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream* fp ) +ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp ) { // Loop on the fragment[s] to get total length - size_t totalLength = 0; - JPEGFragmentsInfo::JPEGFragmentsList::iterator it; - for( it = JPEGInfo->Fragments.begin(); - it != JPEGInfo->Fragments.end(); - ++it ) - { - totalLength += (*it)->Length; - } + size_t totalLength = JPEGInfo->GetFragmentsLength(); // Concatenate the jpeg fragments into a local buffer JOCTET *buffer = new JOCTET [totalLength]; - JOCTET *p = buffer; - - // Loop on the fragment[s] - for( it = JPEGInfo->Fragments.begin(); - it != JPEGInfo->Fragments.end(); - ++it ) - { - fp->seekg( (*it)->Offset, std::ios::beg); - size_t len = (*it)->Length; - fp->read((char *)p,len); - p += len; - } + // Fill in the buffer: + JPEGInfo->ReadAllFragments(fp, buffer); - size_t howManyRead = 0; - size_t howManyWritten = 0; - - if ( BitsStored == 8) - { - if ( ! gdcm_read_JPEG_memory8( buffer, totalLength, Raw, - &howManyRead, &howManyWritten ) ) - { - dbg.Error( - "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg8 " - ); - delete [] buffer; - return false; - } - } - else if ( BitsStored <= 12) - { - if ( ! gdcm_read_JPEG_memory12( buffer, totalLength, Raw, - &howManyRead, &howManyWritten ) ) - { - dbg.Error( - "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg12 " - ); - delete [] buffer; - return false; - } - } - else if ( BitsStored <= 16) - { - - if ( ! gdcm_read_JPEG_memory16( buffer, totalLength, Raw, - &howManyRead, &howManyWritten ) ) - { - dbg.Error( - "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg16 " - ); - delete [] buffer; - return false; - } - } - else - { - // other JPEG lossy not supported - dbg.Error("PixelConvert::ReadAndDecompressJPEGFile: unknown " - "jpeg lossy compression "); - delete [] buffer; - return false; - } + // kludge: // FIXME + JPEGFragmentsInfo::JPEGFragmentsList::const_iterator it = JPEGInfo->Fragments.begin(); + (*it)->DecompressJPEGSingleFrameFragmentsFromFile(buffer, totalLength, Raw, BitsStored); // free local buffer delete [] buffer; @@ -577,37 +457,21 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream* fp ) * @return Boolean */ bool PixelReadConvert:: -ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream* fp ) +ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp ) { // Loop on the fragment[s] to get total length - size_t totalLength = 0; - JPEGFragmentsInfo::JPEGFragmentsList::iterator it; - for( it = JPEGInfo->Fragments.begin(); - it != JPEGInfo->Fragments.end(); - ++it ) - { - totalLength += (*it)->Length; - } + size_t totalLength = JPEGInfo->GetFragmentsLength(); // Concatenate the jpeg fragments into a local buffer JOCTET *buffer = new JOCTET [totalLength]; - JOCTET *p = buffer; - - // Loop on the fragment[s] - for( it = JPEGInfo->Fragments.begin(); - it != JPEGInfo->Fragments.end(); - ++it ) - { - fp->seekg( (*it)->Offset, std::ios::beg); - size_t len = (*it)->Length; - fp->read((char *)p,len); - p+=len; - } + // Fill in the buffer: + JPEGInfo->ReadAllFragments(fp, buffer); size_t howManyRead = 0; size_t howManyWritten = 0; size_t fragmentLength = 0; + JPEGFragmentsInfo::JPEGFragmentsList::const_iterator it; for( it = JPEGInfo->Fragments.begin() ; (it != JPEGInfo->Fragments.end()) && (howManyRead < totalLength); ++it ) @@ -615,50 +479,8 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream* fp ) fragmentLength += (*it)->Length; if (howManyRead > fragmentLength) continue; - - if ( BitsStored == 8) - { - if ( ! gdcm_read_JPEG_memory8( buffer+howManyRead, totalLength-howManyRead, - Raw+howManyWritten, - &howManyRead, &howManyWritten ) ) - { - dbg.Error("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg8 "); - delete [] buffer; - return false; - } - } - else if ( BitsStored <= 12) - { - - if ( ! gdcm_read_JPEG_memory12( buffer+howManyRead, totalLength-howManyRead, - Raw+howManyWritten, - &howManyRead, &howManyWritten ) ) - { - dbg.Error("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg12 "); - delete [] buffer; - return false; - } - } - else if ( BitsStored <= 16) - { - if ( ! gdcm_read_JPEG_memory16( buffer+howManyRead, totalLength-howManyRead, - Raw+howManyWritten, - &howManyRead, &howManyWritten ) ) - { - dbg.Error("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg16 "); - delete [] buffer; - return false; - } - } - else - { - // other JPEG lossy not supported - dbg.Error("PixelConvert::ReadAndDecompressJPEGFile: unknown " - "jpeg lossy compression "); - delete [] buffer; - return false; - } + (*it)->DecompressJPEGFragmentedFramesFromFile(buffer, Raw, BitsStored, howManyRead, howManyWritten, totalLength); if (howManyRead < fragmentLength) howManyRead = fragmentLength; @@ -676,12 +498,12 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream* fp ) * @param fp File Pointer * @return Boolean */ -bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream* fp ) +bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) { if ( IsJPEG2000 ) { fp->seekg( (*JPEGInfo->Fragments.begin())->Offset, std::ios::beg); - if ( ! gdcm_read_JPEG2000_file( fp,Raw ) ) +// if ( ! gdcm_read_JPEG2000_file( fp,Raw ) ) return false; } @@ -738,9 +560,8 @@ bool PixelReadConvert::ConvertReArrangeBits() throw ( FormatError ) } else { - dbg.Verbose(0, "PixelReadConvert::ConvertReArrangeBits: weird image"); - throw FormatError( "PixelReadConvert::ConvertReArrangeBits()", - "weird image !?" ); + gdcmVerboseMacro("Weird image"); + throw FormatError( "Weird image !?" ); } } return true; @@ -752,8 +573,8 @@ bool PixelReadConvert::ConvertReArrangeBits() throw ( FormatError ) */ void PixelReadConvert::ConvertYcBcRPlanesToRGBPixels() { - uint8_t* localRaw = Raw; - uint8_t* copyRaw = new uint8_t[ RawSize ]; + uint8_t *localRaw = Raw; + uint8_t *copyRaw = new uint8_t[ RawSize ]; memmove( copyRaw, localRaw, RawSize ); // to see the tricks about YBR_FULL, YBR_FULL_422, @@ -764,9 +585,9 @@ void PixelReadConvert::ConvertYcBcRPlanesToRGBPixels() int l = XSize * YSize; int nbFrames = ZSize; - uint8_t* a = copyRaw; - uint8_t* b = copyRaw + l; - uint8_t* c = copyRaw + l + l; + uint8_t *a = copyRaw; + uint8_t *b = copyRaw + l; + uint8_t *c = copyRaw + l + l; double R, G, B; /// \todo : Replace by the 'well known' integer computation @@ -806,8 +627,8 @@ void PixelReadConvert::ConvertYcBcRPlanesToRGBPixels() */ void PixelReadConvert::ConvertRGBPlanesToRGBPixels() { - uint8_t* localRaw = Raw; - uint8_t* copyRaw = new uint8_t[ RawSize ]; + uint8_t *localRaw = Raw; + uint8_t *copyRaw = new uint8_t[ RawSize ]; memmove( copyRaw, localRaw, RawSize ); int l = XSize * YSize * ZSize; @@ -825,7 +646,7 @@ void PixelReadConvert::ConvertRGBPlanesToRGBPixels() delete[] copyRaw; } -bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream* fp ) +bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) { // ComputeRawAndRGBSizes is already made by // ::GrabInformationsFromHeader. So, the structure sizes are @@ -836,16 +657,14 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream* fp ) //// First stage: get our hands on the Pixel Data. if ( !fp ) { - dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " - "unavailable file pointer." ); + gdcmVerboseMacro( "Unavailable file pointer." ); return false; } fp->seekg( PixelOffset, std::ios::beg ); - if( fp->fail() || fp->eof()) //Fp->gcount() == 1 + if( fp->fail() || fp->eof()) { - dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " - "unable to find PixelOffset in file." ); + gdcmVerboseMacro( "Unable to find PixelOffset in file." ); return false; } @@ -865,8 +684,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream* fp ) // variable). But RawSize is the right size of the image ! if( PixelDataLength != RawSize) { - dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " - "Mismatch between PixelReadConvert and RawSize." ); + gdcmVerboseMacro( "Mismatch between PixelReadConvert and RawSize." ); } if( PixelDataLength > RawSize) { @@ -877,10 +695,9 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream* fp ) fp->read( (char*)Raw, PixelDataLength); } - if ( fp->fail() || fp->eof())//Fp->gcount() == 1 + if ( fp->fail() || fp->eof()) { - dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " - "reading of Raw pixel data failed." ); + gdcmVerboseMacro( "Reading of Raw pixel data failed." ); return false; } } @@ -888,8 +705,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream* fp ) { if ( ! ReadAndDecompressRLEFile( fp ) ) { - dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " - "RLE decompressor failed." ); + gdcmVerboseMacro( "RLE decompressor failed." ); return false; } } @@ -898,8 +714,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream* fp ) // Default case concerns JPEG family if ( ! ReadAndDecompressJPEGFile( fp ) ) { - dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " - "JPEG decompressor failed." ); + gdcmVerboseMacro( "JPEG decompressor failed." ); return false; } } @@ -940,7 +755,7 @@ void PixelReadConvert::ConvertHandleColor() // formated Dicom) files (e.g. gdcmData/US-PAL-8-10x-echo.dcm) we encounter: // - "Planar Configuration" = 0, // - "Photometric Interpretation" = "PALETTE COLOR". - // Hence gdcm shall use the folowing "heuristic" in order to be tolerant + // Hence gdcm will use the folowing "heuristic" in order to be tolerant // towards Dicom-non-conformance files: // << whatever the "Planar Configuration" value might be, a // "Photometric Interpretation" set to "PALETTE COLOR" forces @@ -1022,7 +837,7 @@ void PixelReadConvert::ComputeRawAndRGBSizes() } } -void PixelReadConvert::GrabInformationsFromHeader( Header* header ) +void PixelReadConvert::GrabInformationsFromHeader( Header *header ) { // Number of Bits Allocated for storing a Pixel is defaulted to 16 // when absent from the header. @@ -1054,17 +869,17 @@ void PixelReadConvert::GrabInformationsFromHeader( Header* header ) PixelSize = header->GetPixelSize(); PixelSign = header->IsSignedPixelData(); SwapCode = header->GetSwapCode(); - TransferSyntaxType ts = header->GetTransferSyntax(); + std::string ts = header->GetTransferSyntax(); IsRaw = ( ! header->IsDicomV3() ) - || ts == ImplicitVRLittleEndian - || ts == ImplicitVRLittleEndianDLXGE - || ts == ExplicitVRLittleEndian - || ts == ExplicitVRBigEndian - || ts == DeflatedExplicitVRLittleEndian; - IsJPEG2000 = header->IsJPEG2000(); - IsJPEGLossless = header->IsJPEGLossless(); - IsRLELossless = ( ts == RLELossless ); + || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian + || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndianDLXGE + || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRLittleEndian + || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian + || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::DeflatedExplicitVRLittleEndian; + IsJPEG2000 = Global::GetTS()->IsJPEG2000(ts); + IsJPEGLossless = Global::GetTS()->IsJPEGLossless(ts); + IsRLELossless = Global::GetTS()->IsRLELossless(ts); PixelOffset = header->GetPixelOffset(); PixelDataLength = header->GetPixelAreaLength(); RLEInfo = header->GetRLEInfo(); @@ -1081,10 +896,9 @@ void PixelReadConvert::GrabInformationsFromHeader( Header* header ) if ( HasLUT ) { // Just in case some access to a Header element requires disk access. - // Note: gdcmDocument::Fp is leaved open after OpenFile. - LutRedDescriptor = header->GetEntryByNumber( 0x0028, 0x1101 ); - LutGreenDescriptor = header->GetEntryByNumber( 0x0028, 0x1102 ); - LutBlueDescriptor = header->GetEntryByNumber( 0x0028, 0x1103 ); + LutRedDescriptor = header->GetEntry( 0x0028, 0x1101 ); + LutGreenDescriptor = header->GetEntry( 0x0028, 0x1102 ); + LutBlueDescriptor = header->GetEntry( 0x0028, 0x1103 ); // Depending on the value of Document::MAX_SIZE_LOAD_ELEMENT_VALUE // [ refer to invocation of Document::SetMaxSizeLoadEntry() in @@ -1092,7 +906,7 @@ void PixelReadConvert::GrabInformationsFromHeader( Header* header ) // [Bin|Val]Entry occurence migth have been hindered (read simply NOT // loaded). Hence, we first try to obtain the LUTs data from the header // and when this fails we read the LUTs data directely from disk. - /// \todo Reading a [Bin|Val]Entry directly from disk is a kludge. + /// \TODO Reading a [Bin|Val]Entry directly from disk is a kludge. /// We should NOT bypass the [Bin|Val]Entry class. Instead /// an access to an UNLOADED content of a [Bin|Val]Entry occurence /// (e.g. BinEntry::GetBinArea()) should force disk access from @@ -1102,29 +916,26 @@ void PixelReadConvert::GrabInformationsFromHeader( Header* header ) ////// Red round header->LoadEntryBinArea(0x0028, 0x1201); - LutRedData = (uint8_t*)header->GetEntryBinAreaByNumber( 0x0028, 0x1201 ); + LutRedData = (uint8_t*)header->GetEntryBinArea( 0x0028, 0x1201 ); if ( ! LutRedData ) { - dbg.Verbose(0, "PixelReadConvert::GrabInformationsFromHeader: " - "unable to read red LUT data" ); + gdcmVerboseMacro( "Unable to read Red LUT data" ); } ////// Green round: header->LoadEntryBinArea(0x0028, 0x1202); - LutGreenData = (uint8_t*)header->GetEntryBinAreaByNumber(0x0028, 0x1202 ); + LutGreenData = (uint8_t*)header->GetEntryBinArea(0x0028, 0x1202 ); if ( ! LutGreenData) { - dbg.Verbose(0, "PixelReadConvert::GrabInformationsFromHeader: " - "unable to read green LUT data" ); + gdcmVerboseMacro( "Unable to read Green LUT data" ); } ////// Blue round: header->LoadEntryBinArea(0x0028, 0x1203); - LutBlueData = (uint8_t*)header->GetEntryBinAreaByNumber( 0x0028, 0x1203 ); + LutBlueData = (uint8_t*)header->GetEntryBinArea( 0x0028, 0x1203 ); if ( ! LutBlueData ) { - dbg.Verbose(0, "PixelReadConvert::GrabInformationsFromHeader: " - "unable to read blue LUT data" ); + gdcmVerboseMacro( "Unable to read Blue LUT data" ); } } @@ -1177,7 +988,7 @@ void PixelReadConvert::BuildLUTRGBA() &lengthR, &debR, &nbitsR ); if( nbRead != 3 ) { - dbg.Verbose(0, "PixelReadConvert::BuildLUTRGBA: wrong red LUT descriptor"); + gdcmVerboseMacro( "Wrong Red LUT descriptor" ); } int lengthG; // Green LUT length in Bytes @@ -1188,7 +999,7 @@ void PixelReadConvert::BuildLUTRGBA() &lengthG, &debG, &nbitsG ); if( nbRead != 3 ) { - dbg.Verbose(0, "PixelReadConvert::BuildLUTRGBA: wrong green LUT descriptor"); + gdcmVerboseMacro( "Wrong Green LUT descriptor" ); } int lengthB; // Blue LUT length in Bytes @@ -1199,7 +1010,7 @@ void PixelReadConvert::BuildLUTRGBA() &lengthB, &debB, &nbitsB ); if( nbRead != 3 ) { - dbg.Verbose(0, "PixelReadConvert::BuildLUTRGBA: wrong blue LUT descriptor"); + gdcmVerboseMacro( "Wrong Blue LUT descriptor" ); } //////////////////////////////////////////////////////// @@ -1234,7 +1045,7 @@ void PixelReadConvert::BuildLUTRGBA() // if it works, we shall have to check the 3 Palettes // to see which byte is ==0 (first one, or second one) // and fix the code - // We give up the checking to avoid some (useless ?)overhead + // We give up the checking to avoid some (useless ?) overhead // (optimistic asumption) int i; uint8_t* a = LutRGBA + 0; @@ -1308,28 +1119,27 @@ bool PixelReadConvert::BuildRGBImage() * @param indent Indentation string to be prepended during printing. * @param os Stream to print to. */ -void PixelReadConvert::Print( std::string indent, std::ostream &os ) +void PixelReadConvert::Print( std::ostream &os, std::string const & indent ) { os << indent << "--- Pixel information -------------------------" << std::endl; os << indent << "Pixel Data: offset " << PixelOffset - << " x" << std::hex << PixelOffset << std::dec - << " length " << PixelDataLength - << " x" << std::hex << PixelDataLength << std::dec - << std::endl; + << " x(" << std::hex << PixelOffset << std::dec + << ") length " << PixelDataLength + << " x(" << std::hex << PixelDataLength << std::dec + << ")" << std::endl; if ( IsRLELossless ) { if ( RLEInfo ) { - RLEInfo->Print( indent, os ); + RLEInfo->Print( os, indent ); } else { - dbg.Verbose(0, "PixelReadConvert::Print: set as RLE file " - "but NO RLEinfo present."); + gdcmVerboseMacro("Set as RLE file but NO RLEinfo present."); } } @@ -1337,12 +1147,11 @@ void PixelReadConvert::Print( std::string indent, std::ostream &os ) { if ( JPEGInfo ) { - JPEGInfo->Print( indent, os ); + JPEGInfo->Print( os, indent ); } else { - dbg.Verbose(0, "PixelReadConvert::Print: set as JPEG file " - "but NO JPEGinfo present."); + gdcmVerboseMacro("Set as JPEG file but NO JPEGinfo present."); } } }