X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.cxx;h=32a8f81dfa4bb3d4573e4f0c14ae45964f527d99;hb=977b70320ec22c560eb92d4669b26455e0842b7b;hp=c8c76c22d2f12747c805bd1fa1043d47c88423d7;hpb=33b1eec26f02131242fbfdef52184b24763cf4e6;p=gdcm.git diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index c8c76c22..32a8f81d 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/11/29 17:21:35 $ - Version: $Revision: 1.106 $ + Date: $Date: 2006/03/29 16:09:48 $ + Version: $Revision: 1.111 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -28,6 +28,10 @@ #include #include //for sscanf +#if defined(__BORLANDC__) + #include // for memset +#endif + namespace gdcm { @@ -82,7 +86,7 @@ bool PixelReadConvert::IsRawRGB() * \brief Gets various usefull informations from the file header * @param file gdcm::File pointer */ -void PixelReadConvert::GrabInformationsFromFile( File *file, +void PixelReadConvert::GrabInformationsFromFile( File *file, FileHelper *fileHelper ) { // Number of Bits Allocated for storing a Pixel is defaulted to 16 @@ -111,16 +115,17 @@ void PixelReadConvert::GrabInformationsFromFile( File *file, XSize = file->GetXSize(); YSize = file->GetYSize(); ZSize = file->GetZSize(); + TSize = file->GetTSize(); SamplesPerPixel = file->GetSamplesPerPixel(); //PixelSize = file->GetPixelSize(); Useless PixelSign = file->IsSignedPixelData(); SwapCode = file->GetSwapCode(); - + IsPrivateGETransferSyntax = IsMPEG = IsJPEG2000 = IsJPEGLS = IsJPEGLossy = IsJPEGLossless = IsRLELossless = false; - + if (! file->IsDicomV3() ) // Should be ACR-NEMA file { IsRaw = true; @@ -130,14 +135,16 @@ void PixelReadConvert::GrabInformationsFromFile( File *file, std::string ts = file->GetTransferSyntax(); IsRaw = false; - while (true) // short to write than if elseif elseif elseif ... + while (true) // shorter to write than 'if elseif elseif elseif' ... { // mind the order : check the most usual first. if( IsRaw = Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRLittleEndian) break; if( IsRaw = Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian ) break; if( IsRaw = Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian) break; if( IsRaw = Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRBigEndianPrivateGE) break; - if( IsRaw = Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::DeflatedExplicitVRLittleEndian) break; + // DeflatedExplicitVRLittleEndian syntax means the whole Dataset (Header + Pixels) is compressed ! + // Not dealt with ! (Parser hangs) + //if( IsRaw = Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::DeflatedExplicitVRLittleEndian) break; break; } // cache whether this is a strange GE transfer syntax (which uses @@ -158,6 +165,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file, if( IsJPEG2000 = Global::GetTS()->IsJPEG2000(ts) ) break; if( IsMPEG = Global::GetTS()->IsMPEG(ts) ) break; if( IsJPEGLS = Global::GetTS()->IsJPEGLS(ts) ) break; + // DeflatedExplicitVRLittleEndian is considered as 'Unexpected' (we don't know yet haow to process !) gdcmWarningMacro("Unexpected Transfer Syntax :[" << ts << "]"); break; } @@ -282,7 +290,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) if ( PixelDataLength != RawSize ) { gdcmWarningMacro( "Mismatch between PixelReadConvert : " - << PixelDataLength << " and RawSize : " << RawSize ); + << PixelDataLength << " and RawSize : " << RawSize ); } //todo : is it the right patch? @@ -301,22 +309,15 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) unsigned int nbFrames = lengthToRead / frameSize; for (i=0;iread( raw, frameSize); raw += frameSize; remainingLength -= frameSize; + count++; } if (remainingLength !=0 ) fp->read( raw, remainingLength); - //if ( PixelDataLength > RawSize ) - //{ - // fp->read( (char*)Raw, RawSize); // Read all the frames with a single fread - //} - //else - //{ - // fp->read( (char*)Raw, PixelDataLength); // Read all the frames with a single fread - //} - if ( fp->fail() || fp->eof()) { gdcmWarningMacro( "Reading of Raw pixel data failed." ); @@ -326,7 +327,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) else if ( IsRLELossless ) { if ( ! RLEInfo->DecompressRLEFile - ( fp, Raw, XSize, YSize, ZSize, BitsAllocated ) ) + ( fp, Raw, XSize, YSize, ZSize, TSize, BitsAllocated ) ) { gdcmWarningMacro( "RLE decompressor failed." ); return false; @@ -448,7 +449,8 @@ bool PixelReadConvert::BuildRGBImage() void PixelReadConvert::ReadAndDecompress12BitsTo16Bits( std::ifstream *fp ) throw ( FormatError ) { - int nbPixels = XSize * YSize; + /// \todo Fix the 3D, 4D pb + int nbPixels = XSize * YSize * TSize; uint16_t *localDecompres = (uint16_t*)Raw; for( int p = 0; p < nbPixels; p += 2 ) @@ -584,7 +586,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) // make sure this is the right JPEG compression assert( !IsJPEGLS || !IsJPEG2000 ); // Precompute the offset localRaw will be shifted with - int length = XSize * YSize * SamplesPerPixel; + int length = XSize * YSize * ZSize * SamplesPerPixel; int numberBytes = BitsAllocated / 8; JPEGInfo->DecompressFromFile(fp, Raw, BitsStored, numberBytes, length ); @@ -598,7 +600,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) * and * - (0028,1101),(0028,1102),(0028,1102) * xxx Palette Color Lookup Table Descriptor are found - * and + * and * - (0028,1201),(0028,1202),(0028,1202) * xxx Palette Color Lookup Table Data - are found * \warning does NOT deal with : @@ -835,7 +837,7 @@ void PixelReadConvert::BuildLUTRGBA() void PixelReadConvert::ConvertSwapZone() { unsigned int i; - + // If this file is 'ImplicitVR BigEndian PrivateGE Transfer Syntax', // then the header is in little endian format and the pixel data is in // big endian format. When reading the header, GDCM has already established @@ -1191,7 +1193,9 @@ void PixelReadConvert::ConvertYcBcRPlanesToRGBPixels() // ftp://medical.nema.org/medical/dicom/final/sup61_ft.pdf // and be *very* affraid // - int l = XSize * YSize; + + /// \todo : find an example to see how 3rd dim and 4th dim work together + int l = XSize * YSize * TSize; int nbFrames = ZSize; uint8_t *a = copyRaw + 0; @@ -1331,7 +1335,7 @@ void PixelReadConvert::ComputeRawAndRGBSizes() bitsAllocated = 16; } - RawSize = XSize * YSize * ZSize + RawSize = XSize * YSize * ZSize * TSize * ( bitsAllocated / 8 ) * SamplesPerPixel; if ( HasLUT )