X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmPixelReadConvert.cxx;h=a06da263d07d8d6af1e2088137008ce30c22a1a8;hb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;hp=13fd0251dc94f10ff7e92573f8bba79b904c370e;hpb=d6b4e16455871f3d41fbddbbb305a2210d80bf02;p=gdcm.git diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index 13fd0251..a06da263 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/10/26 16:15:38 $ - Version: $Revision: 1.93 $ + Date: $Date: 2005/11/28 15:20:34 $ + Version: $Revision: 1.103 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -31,7 +31,7 @@ namespace gdcm { -//bool ReadMPEGFile (std::ifstream *fp, void *image_buffer, size_t lenght); +//bool ReadMPEGFile (std::ifstream *fp, char *inputdata, size_t lenght); bool gdcm_read_JPEG2000_file (void* raw, char *inputdata, size_t inputlength); //----------------------------------------------------------------------------- @@ -114,36 +114,53 @@ void PixelReadConvert::GrabInformationsFromFile( File *file ) //PixelSize = file->GetPixelSize(); Useless PixelSign = file->IsSignedPixelData(); SwapCode = file->GetSwapCode(); - - if (! file->IsDicomV3() ) // Should be ACR-NEMA file - { - IsRaw = true; - // Don't loose time checking unexistant Transfer Syntax ! - IsPrivateGETransferSyntax = IsMPEG + + IsPrivateGETransferSyntax = IsMPEG = IsJPEG2000 = IsJPEGLS = IsJPEGLossy = IsJPEGLossless = IsRLELossless = false; + + if (! file->IsDicomV3() ) // Should be ACR-NEMA file + { + IsRaw = true; } else { std::string ts = file->GetTransferSyntax(); - IsRaw = - Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRLittleEndian - || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRBigEndianPrivateGE - || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRLittleEndian - || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ExplicitVRBigEndian - || Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::DeflatedExplicitVRLittleEndian; - + IsRaw = false; + while (true) // short 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; + break; + } + // cache whether this is a strange GE transfer syntax (which uses + // a little endian transfer syntax for the header and a big endian + // transfer syntax for the pixel data). IsPrivateGETransferSyntax = ( Global::GetTS()->GetSpecialTransferSyntax(ts) == TS::ImplicitVRBigEndianPrivateGE ); - IsMPEG = Global::GetTS()->IsMPEG(ts); - IsJPEG2000 = Global::GetTS()->IsJPEG2000(ts); - IsJPEGLS = Global::GetTS()->IsJPEGLS(ts); - IsJPEGLossy = Global::GetTS()->IsJPEGLossy(ts); - IsJPEGLossless = Global::GetTS()->IsJPEGLossless(ts); - IsRLELossless = Global::GetTS()->IsRLELossless(ts); + IsMPEG = IsJPEG2000 = IsJPEGLS = IsJPEGLossy = IsJPEGLossless = IsRLELossless = false; + if (!IsRaw) + { + while(true) + { + // mind the order : check the most usual first. + if( IsJPEGLossy = Global::GetTS()->IsJPEGLossy(ts) ) break; + if( IsJPEGLossless = Global::GetTS()->IsJPEGLossless(ts) ) break; + if( IsRLELossless = Global::GetTS()->IsRLELossless(ts) ) break; + if( IsJPEG2000 = Global::GetTS()->IsJPEG2000(ts) ) break; + if( IsMPEG = Global::GetTS()->IsMPEG(ts) ) break; + if( IsJPEGLS = Global::GetTS()->IsJPEGLS(ts) ) break; + gdcmStaticWarningMacro("Unexpected Transfer Syntax :[" << ts << "]"); + break; + } + } } PixelOffset = file->GetPixelOffset(); @@ -168,7 +185,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file ) LutGreenDescriptor = file->GetEntryString( 0x0028, 0x1102 ); LutBlueDescriptor = file->GetEntryString( 0x0028, 0x1103 ); - // The following comment is probabely meaningless, since LUT are *always* + // FIXME : The following comment is probabely meaningless, since LUT are *always* // loaded at parsing time, whatever their length is. // Depending on the value of Document::MAX_SIZE_LOAD_ELEMENT_VALUE @@ -190,7 +207,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file ) LutRedData = (uint8_t*)file->GetEntryBinArea( 0x0028, 0x1201 ); if ( ! LutRedData ) { - gdcmWarningMacro("Unable to read Red Palette Color Lookup Table data"); + gdcmStaticWarningMacro("Unable to read Red Palette Color Lookup Table data"); } // //// Green round: @@ -198,7 +215,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file ) LutGreenData = (uint8_t*)file->GetEntryBinArea(0x0028, 0x1202 ); if ( ! LutGreenData) { - gdcmWarningMacro("Unable to read Green Palette Color Lookup Table data"); + gdcmStaticWarningMacro("Unable to read Green Palette Color Lookup Table data"); } // //// Blue round: @@ -206,7 +223,7 @@ void PixelReadConvert::GrabInformationsFromFile( File *file ) LutBlueData = (uint8_t*)file->GetEntryBinArea( 0x0028, 0x1203 ); if ( ! LutBlueData ) { - gdcmWarningMacro("Unable to read Blue Palette Color Lookup Table data"); + gdcmStaticWarningMacro("Unable to read Blue Palette Color Lookup Table data"); } } FileInternal = file; @@ -226,14 +243,14 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) //// First stage: get our hands on the Pixel Data. if ( !fp ) { - gdcmWarningMacro( "Unavailable file pointer." ); + gdcmStaticWarningMacro( "Unavailable file pointer." ); return false; } fp->seekg( PixelOffset, std::ios::beg ); if ( fp->fail() || fp->eof() ) { - gdcmWarningMacro( "Unable to find PixelOffset in file." ); + gdcmStaticWarningMacro( "Unable to find PixelOffset in file." ); return false; } @@ -253,8 +270,8 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) // variable). But RawSize is the right size of the image ! if ( PixelDataLength != RawSize ) { - gdcmWarningMacro( "Mismatch between PixelReadConvert : " - << PixelDataLength << " and RawSize : " << RawSize ); + gdcmStaticWarningMacro( "Mismatch between PixelReadConvert : " + << PixelDataLength << " and RawSize : " << RawSize ); } if ( PixelDataLength > RawSize ) { @@ -267,7 +284,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) if ( fp->fail() || fp->eof()) { - gdcmWarningMacro( "Reading of Raw pixel data failed." ); + gdcmStaticWarningMacro( "Reading of Raw pixel data failed." ); return false; } } @@ -276,16 +293,16 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) if ( ! RLEInfo->DecompressRLEFile ( fp, Raw, XSize, YSize, ZSize, BitsAllocated ) ) { - gdcmWarningMacro( "RLE decompressor failed." ); + gdcmStaticWarningMacro( "RLE decompressor failed." ); return false; } } else if ( IsMPEG ) { - //gdcmWarningMacro( "Sorry, MPEG not yet taken into account" ); + //gdcmStaticWarningMacro( "Sorry, MPEG not yet taken into account" ); //return false; // fp has already been seek to start of mpeg - //ReadMPEGFile(fp, Raw, PixelDataLength); + //ReadMPEGFile(fp, (char*)Raw, PixelDataLength); return true; } else @@ -293,7 +310,8 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) // Default case concerns JPEG family if ( ! ReadAndDecompressJPEGFile( fp ) ) { - gdcmWarningMacro( "JPEG decompressor failed." ); + gdcmStaticWarningMacro( "JPEG decompressor ( ReadAndDecompressJPEGFile()" + << " method ) failed." ); return false; } } @@ -350,7 +368,7 @@ bool PixelReadConvert::BuildRGBImage() return false; } - gdcmWarningMacro( "--> BuildRGBImage" ); + gdcmStaticDebugMacro( "--> BuildRGBImage" ); // Build RGB Pixels AllocateRGB(); @@ -459,7 +477,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) inputlength += jpegfrag->GetLength(); jpegfrag = JPEGInfo->GetNextFragment(); } - gdcmAssertMacro( inputlength != 0); + gdcmStaticAssertMacro( inputlength != 0); uint8_t *inputdata = new uint8_t[inputlength]; char *pinputdata = (char*)inputdata; jpegfrag = JPEGInfo->GetFirstFragment(); @@ -477,6 +495,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) return true; } // wow what happen, must be an error + gdcmStaticWarningMacro( "gdcm_read_JPEG2000_file() failed "); return false; } else if ( IsJPEGLS ) @@ -500,7 +519,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) inputlength += jpegfrag->GetLength(); jpegfrag = JPEGInfo->GetNextFragment(); } - gdcmAssertMacro( inputlength != 0); + gdcmStaticAssertMacro( inputlength != 0); uint8_t *inputdata = new uint8_t[inputlength]; char *pinputdata = (char*)inputdata; jpegfrag = JPEGInfo->GetFirstFragment(); @@ -520,7 +539,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) delete[] inputdata; #endif - gdcmWarningMacro( "Sorry, JPEG-LS not yet taken into account" ); + gdcmStaticWarningMacro( "Sorry, JPEG-LS not yet taken into account" ); fp->seekg( JPEGInfo->GetFirstFragment()->GetOffset(), std::ios::beg); // if ( ! gdcm_read_JPEGLS_file( fp,Raw ) ) return false; @@ -579,7 +598,7 @@ void PixelReadConvert::BuildLUTRGBA() || LutGreenDescriptor == GDCM_UNFOUND || LutBlueDescriptor == GDCM_UNFOUND ) { - gdcmWarningMacro( "(At least) a LUT Descriptor is missing" ); + gdcmStaticWarningMacro( "(At least) a LUT Descriptor is missing" ); return; } @@ -595,7 +614,7 @@ void PixelReadConvert::BuildLUTRGBA() &lengthR, &debR, &nbitsR ); if ( nbRead != 3 ) { - gdcmWarningMacro( "Wrong Red LUT descriptor" ); + gdcmStaticWarningMacro( "Wrong Red LUT descriptor" ); } int lengthG; // Green LUT length in Bytes int debG; // Subscript of the first Lut Value @@ -606,7 +625,7 @@ void PixelReadConvert::BuildLUTRGBA() &lengthG, &debG, &nbitsG ); if ( nbRead != 3 ) { - gdcmWarningMacro( "Wrong Green LUT descriptor" ); + gdcmStaticWarningMacro( "Wrong Green LUT descriptor" ); } int lengthB; // Blue LUT length in Bytes @@ -617,15 +636,15 @@ void PixelReadConvert::BuildLUTRGBA() &lengthB, &debB, &nbitsB ); if ( nbRead != 3 ) { - gdcmWarningMacro( "Wrong Blue LUT descriptor" ); + gdcmStaticWarningMacro( "Wrong Blue LUT descriptor" ); } - gdcmWarningMacro(" lengthR " << lengthR << " debR " - << debR << " nbitsR " << nbitsR); - gdcmWarningMacro(" lengthG " << lengthG << " debG " - << debG << " nbitsG " << nbitsG); - gdcmWarningMacro(" lengthB " << lengthB << " debB " - << debB << " nbitsB " << nbitsB); + gdcmStaticDebugMacro(" lengthR " << lengthR << " debR " + << debR << " nbitsR " << nbitsR); + gdcmStaticDebugMacro(" lengthG " << lengthG << " debG " + << debG << " nbitsG " << nbitsG); + gdcmStaticDebugMacro(" lengthB " << lengthB << " debB " + << debB << " nbitsB " << nbitsB); if ( !lengthR ) // if = 2^16, this shall be 0 see : CP-143 lengthR=65536; @@ -638,7 +657,7 @@ void PixelReadConvert::BuildLUTRGBA() if ( ( ! LutRedData ) || ( ! LutGreenData ) || ( ! LutBlueData ) ) { - gdcmWarningMacro( "(At least) a LUT is missing" ); + gdcmStaticWarningMacro( "(At least) a LUT is missing" ); return; } @@ -716,7 +735,7 @@ void PixelReadConvert::BuildLUTRGBA() // with 65536 entries LUT ?!? // Still looking for accurate info on the web :-( - gdcmWarningMacro( "Sorry Palette Color Lookup Tables not yet dealt with" + gdcmStaticWarningMacro( "Sorry Palette Color Lookup Tables not yet dealt with" << " for 16 Bits Per Pixel images" ); // forge the 4 * 16 Bits Red/Green/Blue/Alpha LUT @@ -781,7 +800,6 @@ void PixelReadConvert::BuildLUTRGBA() void PixelReadConvert::ConvertSwapZone() { unsigned int i; - uint16_t localSwapCode = SwapCode; // If this file is 'ImplicitVR BigEndian PrivateGE Transfer Syntax', // then the header is in little endian format and the pixel data is in @@ -809,28 +827,27 @@ void PixelReadConvert::ConvertSwapZone() // Therefore, in either case, if the file is in // 'ImplicitVR BigEndian PrivateGE Transfer Syntax', then GDCM needs to switch // the byte swapping code when entering the pixel data. - -/* //Let me check something. - //I wait for the Dashboard ! + + int tempSwapCode = SwapCode; if ( IsPrivateGETransferSyntax ) { + gdcmWarningMacro(" IsPrivateGETransferSyntax found; turn the SwapCode"); // PrivateGETransferSyntax only exists for 'true' Dicom images // we assume there is no 'exotic' 32 bits endianess! - switch (localSwapCode) + if (SwapCode == 1234) { - case 1234: - localSwapCode = 4321; - break; - case 4321: - localSwapCode = 1234; - break; - } + tempSwapCode = 4321; + } + else if (SwapCode == 4321) + { + tempSwapCode = 1234; + } } -*/ + if ( BitsAllocated == 16 ) { uint16_t *im16 = (uint16_t*)Raw; - switch( localSwapCode ) + switch( tempSwapCode ) { case 1234: break; @@ -843,7 +860,8 @@ void PixelReadConvert::ConvertSwapZone() } break; default: - gdcmWarningMacro("SwapCode value (16 bits) not allowed."); + gdcmStaticWarningMacro("SwapCode value (16 bits) not allowed." + << tempSwapCode); } } else if ( BitsAllocated == 32 ) @@ -852,7 +870,7 @@ void PixelReadConvert::ConvertSwapZone() uint16_t high; uint16_t low; uint32_t *im32 = (uint32_t*)Raw; - switch ( localSwapCode ) + switch ( tempSwapCode ) { case 1234: break; @@ -888,7 +906,7 @@ void PixelReadConvert::ConvertSwapZone() } break; default: - gdcmWarningMacro("SwapCode value (32 bits) not allowed." ); + gdcmStaticWarningMacro("SwapCode value (32 bits) not allowed." << tempSwapCode ); } } } @@ -1078,7 +1096,7 @@ bool PixelReadConvert::ConvertReArrangeBits() throw ( FormatError ) } else { - gdcmWarningMacro("Weird image (BitsAllocated !=8, 12, 16, 32)"); + gdcmStaticWarningMacro("Weird image (BitsAllocated !=8, 12, 16, 32)"); throw FormatError( "Weird image !?" ); } } @@ -1091,7 +1109,7 @@ bool PixelReadConvert::ConvertReArrangeBits() throw ( FormatError ) */ void PixelReadConvert::ConvertRGBPlanesToRGBPixels() { - gdcmWarningMacro("--> ConvertRGBPlanesToRGBPixels"); + gdcmStaticWarningMacro("--> ConvertRGBPlanesToRGBPixels"); uint8_t *localRaw = Raw; uint8_t *copyRaw = new uint8_t[ RawSize ]; @@ -1127,7 +1145,7 @@ void PixelReadConvert::ConvertYcBcRPlanesToRGBPixels() // On such images, RLE achieves a compression ratio that is much better // than the compression ratio on an equivalent RGB image. - gdcmWarningMacro("--> ConvertYcBcRPlanesToRGBPixels"); + gdcmStaticWarningMacro("--> ConvertYcBcRPlanesToRGBPixels"); uint8_t *localRaw = Raw; uint8_t *copyRaw = new uint8_t[ RawSize ]; @@ -1227,13 +1245,13 @@ void PixelReadConvert::ConvertHandleColor() // - [Planar 1] AND [Photo C] handled with ConvertYcBcRPlanesToRGBPixels() // - [Planar 2] OR [Photo D] requires LUT intervention. - gdcmWarningMacro("--> ConvertHandleColor" - << "Planar Configuration " << PlanarConfiguration ); + gdcmStaticDebugMacro("--> ConvertHandleColor " + << "Planar Configuration " << PlanarConfiguration ); if ( ! IsRawRGB() ) { // [Planar 2] OR [Photo D]: LUT intervention done outside - gdcmWarningMacro("--> RawRGB : LUT intervention done outside"); + gdcmStaticDebugMacro("--> RawRGB : LUT intervention done outside"); return; } @@ -1242,13 +1260,13 @@ void PixelReadConvert::ConvertHandleColor() if ( IsYBRFull ) { // [Planar 1] AND [Photo C] (remember YBR_FULL_422 acts as RGB) - gdcmWarningMacro("--> YBRFull"); + gdcmStaticDebugMacro("--> YBRFull"); ConvertYcBcRPlanesToRGBPixels(); } else { // [Planar 1] AND [Photo C] - gdcmWarningMacro("--> YBRFull"); + gdcmStaticDebugMacro("--> YBRFull"); ConvertRGBPlanesToRGBPixels(); } return; @@ -1259,7 +1277,7 @@ void PixelReadConvert::ConvertHandleColor() if (IsRLELossless) { - gdcmWarningMacro("--> RLE Lossless"); + gdcmStaticDebugMacro("--> RLE Lossless"); ConvertRGBPlanesToRGBPixels(); } @@ -1334,7 +1352,7 @@ void PixelReadConvert::Print( std::ostream &os, std::string const &indent ) } else { - gdcmWarningMacro("Set as RLE file but NO RLEinfo present."); + gdcmStaticWarningMacro("Set as RLE file but NO RLEinfo present."); } } @@ -1346,7 +1364,7 @@ void PixelReadConvert::Print( std::ostream &os, std::string const &indent ) } else { - gdcmWarningMacro("Set as JPEG file but NO JPEGinfo present."); + gdcmStaticWarningMacro("Set as JPEG file but NO JPEGinfo present."); } } }