X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.cxx;h=31ebbc479f3abb10d2f90dd3a1d68f87723be6e7;hb=a462ce9f1af0894cd930ab04f2e65cd80dfa7084;hp=2d6e0545343db63c889fafd913593a574c68624c;hpb=ee91cee9d641284ed6a410f2af286bb681829055;p=gdcm.git diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index 2d6e0545..31ebbc47 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/16 11:37:03 $ - Version: $Revision: 1.12 $ + Date: $Date: 2005/01/08 15:03:59 $ + Version: $Revision: 1.20 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -41,21 +41,21 @@ 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, +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_file12 (std::ifstream *fp, void *image_buffer); bool gdcm_read_JPEG_memory12 (const JOCTET *buffer, const size_t buflen, - void* image_buffer, + 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_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); @@ -121,7 +121,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; @@ -216,10 +216,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 +259,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 +273,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,7 +314,7 @@ void PixelReadConvert::ConvertSwapZone() if( BitsAllocated == 16 ) { - uint16_t* im16 = (uint16_t*)Raw; + uint16_t *im16 = (uint16_t*)Raw; switch( SwapCode ) { case 0: @@ -332,8 +331,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 ) @@ -379,8 +377,7 @@ void PixelReadConvert::ConvertSwapZone() } break; default: - dbg.Verbose( 0, "PixelReadConvert::ConvertSwapZone: SwapCode value " - "(32 bits) not allowed." ); + gdcmVerboseMacro("SwapCode value (32 bits) not allowed." ); } } } @@ -421,9 +418,9 @@ void PixelReadConvert::ConvertReorderEndianity() * @param fp File Pointer * @return Boolean */ -bool PixelReadConvert::ReadAndDecompressJPEGFramesFromFile( std::ifstream* fp ) +bool PixelReadConvert::ReadAndDecompressJPEGFramesFromFile( std::ifstream *fp ) { - uint8_t* localRaw = Raw; + uint8_t *localRaw = Raw; // Loop on the fragment[s] for( JPEGFragmentsInfo::JPEGFragmentsList::iterator it = JPEGInfo->Fragments.begin(); @@ -455,13 +452,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; } @@ -485,7 +481,7 @@ 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; @@ -520,9 +516,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 +526,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 +537,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 +545,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; } @@ -577,7 +566,7 @@ 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; @@ -622,7 +611,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 +623,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 +635,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 +643,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; } @@ -676,7 +664,7 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream* fp ) * @param fp File Pointer * @return Boolean */ -bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream* fp ) +bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) { if ( IsJPEG2000 ) { @@ -738,9 +726,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 +739,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 +751,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 +793,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 +812,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 +823,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 +850,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 +861,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 +871,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 +880,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; } } @@ -1022,7 +1003,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. @@ -1081,10 +1062,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 @@ -1102,29 +1082,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 +1154,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 +1165,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 +1176,7 @@ void PixelReadConvert::BuildLUTRGBA() &lengthB, &debB, &nbitsB ); if( nbRead != 3 ) { - dbg.Verbose(0, "PixelReadConvert::BuildLUTRGBA: wrong blue LUT descriptor"); + gdcmVerboseMacro( "Wrong blue LUT descriptor" ); } //////////////////////////////////////////////////////// @@ -1337,8 +1314,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."); } } @@ -1350,8 +1326,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."); } } }