X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.cxx;h=9ef62cd05b34fabe0e113d1bc2cfb20b400757ad;hb=5887c4beef24959af83e43efad0bb86acac9339e;hp=07c2fd94c5e158a7869e73e544be8286484348c8;hpb=327dfe7647e3720b0f3125f9b19397cb9afc0ed3;p=gdcm.git diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index 07c2fd94..9ef62cd0 100644 --- a/src/gdcmPixelReadConvert.cxx +++ b/src/gdcmPixelReadConvert.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmPixelReadConvert.cxx,v $ Language: C++ - Date: $Date: 2005/01/06 20:03:28 $ - Version: $Revision: 1.14 $ + Date: $Date: 2005/01/12 15:22:23 $ + Version: $Revision: 1.25 $ 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" @@ -167,7 +169,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) @@ -259,8 +261,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; } } @@ -318,11 +319,8 @@ void PixelReadConvert::ConvertSwapZone() 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 +330,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 +341,6 @@ void PixelReadConvert::ConvertSwapZone() uint32_t* im32 = (uint32_t*)Raw; switch ( SwapCode ) { - case 0: case 1234: break; case 4321: @@ -379,8 +375,7 @@ void PixelReadConvert::ConvertSwapZone() } break; default: - dbg.Verbose( 0, "PixelReadConvert::ConvertSwapZone: SwapCode value " - "(32 bits) not allowed." ); + gdcmVerboseMacro("SwapCode value (32 bits) not allowed." ); } } } @@ -455,13 +450,12 @@ bool PixelReadConvert::ReadAndDecompressJPEGFramesFromFile( std::ifstream *fp ) { return false; } - //assert( IsJPEGLossless ); + //gdcmAssertMacro( IsJPEGLossless ); } else { // other JPEG lossy not supported - dbg.Error("PixelReadConvert::ReadAndDecompressJPEGFile: unknown " - "jpeg lossy compression "); + gdcmErrorMacro( "Unknown jpeg lossy compression "); return false; } @@ -520,9 +514,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp ) if ( ! gdcm_read_JPEG_memory8( buffer, totalLength, Raw, &howManyRead, &howManyWritten ) ) { - dbg.Error( - "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg8 " - ); + gdcmErrorMacro( "Failed to read jpeg8 "); delete [] buffer; return false; } @@ -532,9 +524,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp ) if ( ! gdcm_read_JPEG_memory12( buffer, totalLength, Raw, &howManyRead, &howManyWritten ) ) { - dbg.Error( - "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg12 " - ); + gdcmErrorMacro( "Failed to read jpeg12 "); delete [] buffer; return false; } @@ -545,9 +535,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp ) if ( ! gdcm_read_JPEG_memory16( buffer, totalLength, Raw, &howManyRead, &howManyWritten ) ) { - dbg.Error( - "PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg16 " - ); + gdcmErrorMacro( "Failed to read jpeg16 "); delete [] buffer; return false; } @@ -555,8 +543,7 @@ ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp ) else { // other JPEG lossy not supported - dbg.Error("PixelConvert::ReadAndDecompressJPEGFile: unknown " - "jpeg lossy compression "); + gdcmErrorMacro( "Unknown jpeg lossy compression "); delete [] buffer; return false; } @@ -622,7 +609,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp ) Raw+howManyWritten, &howManyRead, &howManyWritten ) ) { - dbg.Error("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg8 "); + gdcmErrorMacro( "Failed to read jpeg8"); delete [] buffer; return false; } @@ -634,7 +621,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp ) Raw+howManyWritten, &howManyRead, &howManyWritten ) ) { - dbg.Error("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg12 "); + gdcmErrorMacro( "Failed to read jpeg12"); delete [] buffer; return false; } @@ -646,7 +633,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp ) Raw+howManyWritten, &howManyRead, &howManyWritten ) ) { - dbg.Error("PixelConvert::ReadAndDecompressJPEGFile: failed to read jpeg16 "); + gdcmErrorMacro( "Failed to read jpeg16 "); delete [] buffer; return false; } @@ -654,8 +641,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp ) else { // other JPEG lossy not supported - dbg.Error("PixelConvert::ReadAndDecompressJPEGFile: unknown " - "jpeg lossy compression "); + gdcmErrorMacro( "Unknown jpeg lossy compression "); delete [] buffer; return false; } @@ -738,9 +724,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; @@ -836,16 +821,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 +848,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 +859,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 +869,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 +878,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; } } @@ -1054,17 +1033,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,9 +1060,9 @@ void PixelReadConvert::GrabInformationsFromHeader( Header *header ) if ( HasLUT ) { // Just in case some access to a Header element requires disk access. - 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 @@ -1101,29 +1080,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" ); } } @@ -1176,7 +1152,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 @@ -1187,7 +1163,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 @@ -1198,7 +1174,7 @@ void PixelReadConvert::BuildLUTRGBA() &lengthB, &debB, &nbitsB ); if( nbRead != 3 ) { - dbg.Verbose(0, "PixelReadConvert::BuildLUTRGBA: wrong blue LUT descriptor"); + gdcmVerboseMacro( "Wrong blue LUT descriptor" ); } //////////////////////////////////////////////////////// @@ -1336,8 +1312,7 @@ void PixelReadConvert::Print( std::string indent, std::ostream &os ) } else { - dbg.Verbose(0, "PixelReadConvert::Print: set as RLE file " - "but NO RLEinfo present."); + gdcmVerboseMacro("Set as RLE file but NO RLEinfo present."); } } @@ -1349,8 +1324,7 @@ void PixelReadConvert::Print( std::string indent, std::ostream &os ) } else { - dbg.Verbose(0, "PixelReadConvert::Print: set as JPEG file " - "but NO JPEGinfo present."); + gdcmVerboseMacro("Set as JPEG file but NO JPEGinfo present."); } } }