X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelConvert.cxx;h=28653c12135dbbc442b1d0aa28b04d5115edc189;hb=edfc14dd195f9759cf02da0959d96d1499d572be;hp=5abd6c4ef99cb8ca080c10fe28bf4300a9cc478d;hpb=2d43f5c8ae2004242af2297ceb2926d81675548f;p=gdcm.git diff --git a/src/gdcmPixelConvert.cxx b/src/gdcmPixelConvert.cxx index 5abd6c4e..28653c12 100644 --- a/src/gdcmPixelConvert.cxx +++ b/src/gdcmPixelConvert.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmPixelConvert.cxx,v $ Language: C++ - Date: $Date: 2004/10/28 22:21:57 $ - Version: $Revision: 1.22 $ + Date: $Date: 2004/11/30 16:59:32 $ + Version: $Revision: 1.34 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -25,6 +25,7 @@ #include "gdcmDebug.h" #include "gdcmPixelConvert.h" #include +#include namespace gdcm { @@ -65,14 +66,19 @@ void PixelConvert::Squeeze() { delete [] RGB; } + RGB = 0; + if ( Decompressed ) { delete [] Decompressed; } + Decompressed = 0; + if ( LutRGBA ) { delete [] LutRGBA; } + LutRGBA = 0; } PixelConvert::~PixelConvert() @@ -173,8 +179,8 @@ bool PixelConvert::DecompressRLE16BitsFromRLE8Bits( int NumberOfFrames ) { for ( unsigned int j = 0; j < PixelNumber; j++ ) { - *(x++) = *(a++); *(x++) = *(b++); + *(x++) = *(a++); } } @@ -267,7 +273,7 @@ bool PixelConvert::ReadAndDecompressRLEFile( std::ifstream* fp ) // Loop on the fragments for( unsigned int k = 1; k <= (*it)->NumberFragments; k++ ) { - fp->seekg( (*it)->Offset[k] , std::ios_base::beg ); + fp->seekg( (*it)->Offset[k] , std::ios::beg ); (void)ReadAndDecompressRLEFragment( subDecompressed, (*it)->Length[k], decompressedSegmentSize, @@ -407,7 +413,7 @@ bool PixelConvert::ReadAndDecompressJPEGFile( std::ifstream* fp ) it != JPEGInfo->Fragments.end(); ++it ) { - fp->seekg( (*it)->Offset, std::ios_base::beg); + fp->seekg( (*it)->Offset, std::ios::beg); if ( IsJPEG2000 ) { @@ -424,7 +430,7 @@ bool PixelConvert::ReadAndDecompressJPEGFile( std::ifstream* fp ) return false; } } - else if ( BitsStored == 12) + else if ( BitsStored <= 12) { // Reading Fragment pixels if ( ! gdcm_read_JPEG_file12 ( fp, localDecompressed ) ) @@ -432,7 +438,7 @@ bool PixelConvert::ReadAndDecompressJPEGFile( std::ifstream* fp ) return false; } } - else if ( BitsStored == 16) + else if ( BitsStored <= 16) { // Reading Fragment pixels if ( ! gdcm_read_JPEG_file16 ( fp, localDecompressed ) ) @@ -581,25 +587,30 @@ void PixelConvert::ConvertRGBPlanesToRGBPixels() bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp ) { - ComputeDecompressedAndRGBSizes(); - AllocateDecompressed(); + // ComputeDecompressedAndRGBSizes is already made by + // ::GrabInformationsFromHeader. So, the structure sizes are + // correct + Squeeze(); + ////////////////////////////////////////////////// //// First stage: get our hands on the Pixel Data. if ( !fp ) { - dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " - "unavailable file pointer." ); + dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " + "unavailable file pointer." ); return false; } - fp->seekg( PixelOffset, std::ios_base::beg ); + fp->seekg( PixelOffset, std::ios::beg ); if( fp->fail() || fp->eof()) //Fp->gcount() == 1 { - dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " - "unable to find PixelOffset in file." ); + dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " + "unable to find PixelOffset in file." ); return false; } + AllocateDecompressed(); + ////////////////////////////////////////////////// //// Second stage: read from disk dans decompress. if ( BitsAllocated == 12 ) @@ -608,7 +619,24 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp ) } else if ( IsDecompressed ) { - fp->read( (char*)Decompressed, PixelDataLength); + // This problem can be found when some obvious informations are found + // after the field containing the image datas. In this case, these + // bad datas are added to the size of the image (in the PixelDataLength + // variable). But DecompressedSize is the right size of the image ! + if( PixelDataLength != DecompressedSize) + { + dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " + "Mismatch between PixelConvert and DecompressedSize." ); + } + if( PixelDataLength > DecompressedSize) + { + fp->read( (char*)Decompressed, DecompressedSize); + } + else + { + fp->read( (char*)Decompressed, PixelDataLength); + } + if ( fp->fail() || fp->eof())//Fp->gcount() == 1 { dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " @@ -748,14 +776,17 @@ void PixelConvert::ComputeDecompressedAndRGBSizes() { RGBSize = 3 * DecompressedSize; } - + else + { + RGBSize = DecompressedSize; + } } void PixelConvert::GrabInformationsFromHeader( Header* header ) { // Just in case some access to a Header element requires disk access. // Note: gdcmDocument::Fp is leaved open after OpenFile. - std::ifstream* fp = header->OpenFile(); + std::ifstream* fp = header->OpenFile(); // Number of Bits Allocated for storing a Pixel is defaulted to 16 // when absent from the header. BitsAllocated = header->GetBitsAllocated(); @@ -790,6 +821,7 @@ void PixelConvert::GrabInformationsFromHeader( Header* header ) IsDecompressed = ( ! header->IsDicomV3() ) || ts == ImplicitVRLittleEndian + || ts == ImplicitVRLittleEndianDLXGE || ts == ExplicitVRLittleEndian || ts == ExplicitVRBigEndian || ts == DeflatedExplicitVRLittleEndian; @@ -837,16 +869,15 @@ void PixelConvert::GrabInformationsFromHeader( Header* header ) DocEntry* lutRedDataEntry = header->GetDocEntryByNumber( 0x0028, 0x1201 ); LutRedData = new uint8_t[ lutRedDataEntry->GetLength() ]; - fp->seekg( lutRedDataEntry->GetOffset() ,std::ios_base::beg ); + fp->seekg( lutRedDataEntry->GetOffset() ,std::ios::beg ); fp->read( (char*)LutRedData, (size_t)lutRedDataEntry->GetLength()); if ( fp->fail() || fp->eof())//Fp->gcount() == 1 { dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: " "unable to read red LUT data" ); - return; } } - + ////// Green round: LutGreenData = (uint8_t*)header->GetEntryBinAreaByNumber(0x0028, 0x1202 ); if ( ! LutGreenData) @@ -855,16 +886,15 @@ void PixelConvert::GrabInformationsFromHeader( Header* header ) DocEntry* lutGreenDataEntry = header->GetDocEntryByNumber( 0x0028, 0x1202 ); LutGreenData = new uint8_t[ lutGreenDataEntry->GetLength() ]; - fp->seekg( lutGreenDataEntry->GetOffset() , std::ios_base::beg ); + fp->seekg( lutGreenDataEntry->GetOffset() , std::ios::beg ); fp->read( (char*)LutGreenData, (size_t)lutGreenDataEntry->GetLength() ); if ( fp->fail() || fp->eof())//Fp->gcount() == 1 { dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: " "unable to read green LUT data" ); - return; } } - + ////// Blue round: LutBlueData = (uint8_t*)header->GetEntryBinAreaByNumber( 0x0028, 0x1203 ); if ( ! LutBlueData ) @@ -873,18 +903,22 @@ void PixelConvert::GrabInformationsFromHeader( Header* header ) DocEntry* lutBlueDataEntry = header->GetDocEntryByNumber( 0x0028, 0x1203 ); LutBlueData = new uint8_t[ lutBlueDataEntry->GetLength() ]; - fp->seekg( lutBlueDataEntry->GetOffset() , std::ios_base::beg ); + fp->seekg( lutBlueDataEntry->GetOffset() , std::ios::beg ); fp->read( (char*)LutBlueData, (size_t)lutBlueDataEntry->GetLength() ); if ( fp->fail() || fp->eof())//Fp->gcount() == 1 { dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: " "unable to read blue LUT data" ); - return; } } } - - header->CloseFile(); + + ComputeDecompressedAndRGBSizes(); + + if(fp) + { + header->CloseFile(); + } } /**