Program: gdcm
Module: $RCSfile: gdcmPixelReadConvert.cxx,v $
Language: C++
- Date: $Date: 2005/11/28 15:20:34 $
- Version: $Revision: 1.103 $
+ Date: $Date: 2005/11/29 17:21:35 $
+ Version: $Revision: 1.106 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* \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
// when absent from the file.
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 << "]");
+ gdcmWarningMacro("Unexpected Transfer Syntax :[" << ts << "]");
break;
}
}
LutRedData = (uint8_t*)file->GetEntryBinArea( 0x0028, 0x1201 );
if ( ! LutRedData )
{
- gdcmStaticWarningMacro("Unable to read Red Palette Color Lookup Table data");
+ gdcmWarningMacro("Unable to read Red Palette Color Lookup Table data");
}
// //// Green round:
LutGreenData = (uint8_t*)file->GetEntryBinArea(0x0028, 0x1202 );
if ( ! LutGreenData)
{
- gdcmStaticWarningMacro("Unable to read Green Palette Color Lookup Table data");
+ gdcmWarningMacro("Unable to read Green Palette Color Lookup Table data");
}
// //// Blue round:
LutBlueData = (uint8_t*)file->GetEntryBinArea( 0x0028, 0x1203 );
if ( ! LutBlueData )
{
- gdcmStaticWarningMacro("Unable to read Blue Palette Color Lookup Table data");
+ gdcmWarningMacro("Unable to read Blue Palette Color Lookup Table data");
}
}
FileInternal = file;
-
+ FH = fileHelper;
ComputeRawAndRGBSizes();
}
//// First stage: get our hands on the Pixel Data.
if ( !fp )
{
- gdcmStaticWarningMacro( "Unavailable file pointer." );
+ gdcmWarningMacro( "Unavailable file pointer." );
return false;
}
fp->seekg( PixelOffset, std::ios::beg );
if ( fp->fail() || fp->eof() )
{
- gdcmStaticWarningMacro( "Unable to find PixelOffset in file." );
+ gdcmWarningMacro( "Unable to find PixelOffset in file." );
return false;
}
AllocateRaw();
//////////////////////////////////////////////////
+
+ CallStartMethod(); // for progress bar
+ unsigned int count = 0;
+ unsigned int frameSize;
+ unsigned int bitsAllocated = BitsAllocated;
+ if(bitsAllocated == 12)
+ bitsAllocated = 16;
+ frameSize = XSize*YSize*SamplesPerPixel*bitsAllocated/8;
+
//// Second stage: read from disk and decompress.
- if ( BitsAllocated == 12 )
+
+ if ( BitsAllocated == 12 ) // We suppose 'BitsAllocated' = 12 only exist for uncompressed files
{
ReadAndDecompress12BitsTo16Bits( fp);
}
// variable). But RawSize is the right size of the image !
if ( PixelDataLength != RawSize )
{
- gdcmStaticWarningMacro( "Mismatch between PixelReadConvert : "
+ gdcmWarningMacro( "Mismatch between PixelReadConvert : "
<< PixelDataLength << " and RawSize : " << RawSize );
}
+
+ //todo : is it the right patch?
+ char *raw = (char*)Raw;
+ uint32_t remainingLength;
+ unsigned int i;
+ unsigned int lengthToRead;
+
if ( PixelDataLength > RawSize )
- {
- fp->read( (char*)Raw, RawSize);
- }
+ lengthToRead = RawSize;
else
+ lengthToRead = PixelDataLength;
+
+ // perform a frame by frame reading
+ remainingLength = lengthToRead;
+ unsigned int nbFrames = lengthToRead / frameSize;
+ for (i=0;i<nbFrames; i++)
{
- fp->read( (char*)Raw, PixelDataLength);
+ fp->read( raw, frameSize);
+ raw += frameSize;
+ remainingLength -= frameSize;
}
+ 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())
{
- gdcmStaticWarningMacro( "Reading of Raw pixel data failed." );
+ gdcmWarningMacro( "Reading of Raw pixel data failed." );
return false;
}
}
if ( ! RLEInfo->DecompressRLEFile
( fp, Raw, XSize, YSize, ZSize, BitsAllocated ) )
{
- gdcmStaticWarningMacro( "RLE decompressor failed." );
+ gdcmWarningMacro( "RLE decompressor failed." );
return false;
}
}
else if ( IsMPEG )
{
- //gdcmStaticWarningMacro( "Sorry, MPEG not yet taken into account" );
+ //gdcmWarningMacro( "Sorry, MPEG not yet taken into account" );
//return false;
// fp has already been seek to start of mpeg
//ReadMPEGFile(fp, (char*)Raw, PixelDataLength);
// Default case concerns JPEG family
if ( ! ReadAndDecompressJPEGFile( fp ) )
{
- gdcmStaticWarningMacro( "JPEG decompressor ( ReadAndDecompressJPEGFile()"
+ gdcmWarningMacro( "JPEG decompressor ( ReadAndDecompressJPEGFile()"
<< " method ) failed." );
return false;
}
return false;
}
- gdcmStaticDebugMacro( "--> BuildRGBImage" );
+ gdcmDebugMacro( "--> BuildRGBImage" );
// Build RGB Pixels
AllocateRGB();
inputlength += jpegfrag->GetLength();
jpegfrag = JPEGInfo->GetNextFragment();
}
- gdcmStaticAssertMacro( inputlength != 0);
+ gdcmAssertMacro( inputlength != 0);
uint8_t *inputdata = new uint8_t[inputlength];
char *pinputdata = (char*)inputdata;
jpegfrag = JPEGInfo->GetFirstFragment();
return true;
}
// wow what happen, must be an error
- gdcmStaticWarningMacro( "gdcm_read_JPEG2000_file() failed ");
+ gdcmWarningMacro( "gdcm_read_JPEG2000_file() failed ");
return false;
}
else if ( IsJPEGLS )
inputlength += jpegfrag->GetLength();
jpegfrag = JPEGInfo->GetNextFragment();
}
- gdcmStaticAssertMacro( inputlength != 0);
+ gdcmAssertMacro( inputlength != 0);
uint8_t *inputdata = new uint8_t[inputlength];
char *pinputdata = (char*)inputdata;
jpegfrag = JPEGInfo->GetFirstFragment();
delete[] inputdata;
#endif
- gdcmStaticWarningMacro( "Sorry, JPEG-LS not yet taken into account" );
+ gdcmWarningMacro( "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;
|| LutGreenDescriptor == GDCM_UNFOUND
|| LutBlueDescriptor == GDCM_UNFOUND )
{
- gdcmStaticWarningMacro( "(At least) a LUT Descriptor is missing" );
+ gdcmWarningMacro( "(At least) a LUT Descriptor is missing" );
return;
}
&lengthR, &debR, &nbitsR );
if ( nbRead != 3 )
{
- gdcmStaticWarningMacro( "Wrong Red LUT descriptor" );
+ gdcmWarningMacro( "Wrong Red LUT descriptor" );
}
int lengthG; // Green LUT length in Bytes
int debG; // Subscript of the first Lut Value
&lengthG, &debG, &nbitsG );
if ( nbRead != 3 )
{
- gdcmStaticWarningMacro( "Wrong Green LUT descriptor" );
+ gdcmWarningMacro( "Wrong Green LUT descriptor" );
}
int lengthB; // Blue LUT length in Bytes
&lengthB, &debB, &nbitsB );
if ( nbRead != 3 )
{
- gdcmStaticWarningMacro( "Wrong Blue LUT descriptor" );
+ gdcmWarningMacro( "Wrong Blue LUT descriptor" );
}
- gdcmStaticDebugMacro(" lengthR " << lengthR << " debR "
- << debR << " nbitsR " << nbitsR);
- gdcmStaticDebugMacro(" lengthG " << lengthG << " debG "
- << debG << " nbitsG " << nbitsG);
- gdcmStaticDebugMacro(" lengthB " << lengthB << " debB "
- << debB << " nbitsB " << nbitsB);
+ gdcmDebugMacro(" lengthR " << lengthR << " debR "
+ << debR << " nbitsR " << nbitsR);
+ gdcmDebugMacro(" lengthG " << lengthG << " debG "
+ << debG << " nbitsG " << nbitsG);
+ gdcmDebugMacro(" lengthB " << lengthB << " debB "
+ << debB << " nbitsB " << nbitsB);
if ( !lengthR ) // if = 2^16, this shall be 0 see : CP-143
lengthR=65536;
if ( ( ! LutRedData ) || ( ! LutGreenData ) || ( ! LutBlueData ) )
{
- gdcmStaticWarningMacro( "(At least) a LUT is missing" );
+ gdcmWarningMacro( "(At least) a LUT is missing" );
return;
}
// with 65536 entries LUT ?!?
// Still looking for accurate info on the web :-(
- gdcmStaticWarningMacro( "Sorry Palette Color Lookup Tables not yet dealt with"
+ gdcmWarningMacro( "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
}
break;
default:
- gdcmStaticWarningMacro("SwapCode value (16 bits) not allowed."
+ gdcmWarningMacro("SwapCode value (16 bits) not allowed."
<< tempSwapCode);
}
}
}
break;
default:
- gdcmStaticWarningMacro("SwapCode value (32 bits) not allowed." << tempSwapCode );
+ gdcmWarningMacro("SwapCode value (32 bits) not allowed." << tempSwapCode );
}
}
}
}
else
{
- gdcmStaticWarningMacro("Weird image (BitsAllocated !=8, 12, 16, 32)");
+ gdcmWarningMacro("Weird image (BitsAllocated !=8, 12, 16, 32)");
throw FormatError( "Weird image !?" );
}
}
*/
void PixelReadConvert::ConvertRGBPlanesToRGBPixels()
{
- gdcmStaticWarningMacro("--> ConvertRGBPlanesToRGBPixels");
+ gdcmWarningMacro("--> ConvertRGBPlanesToRGBPixels");
uint8_t *localRaw = Raw;
uint8_t *copyRaw = new uint8_t[ RawSize ];
// On such images, RLE achieves a compression ratio that is much better
// than the compression ratio on an equivalent RGB image.
- gdcmStaticWarningMacro("--> ConvertYcBcRPlanesToRGBPixels");
+ gdcmWarningMacro("--> ConvertYcBcRPlanesToRGBPixels");
uint8_t *localRaw = Raw;
uint8_t *copyRaw = new uint8_t[ RawSize ];
// - [Planar 1] AND [Photo C] handled with ConvertYcBcRPlanesToRGBPixels()
// - [Planar 2] OR [Photo D] requires LUT intervention.
- gdcmStaticDebugMacro("--> ConvertHandleColor "
+ gdcmDebugMacro("--> ConvertHandleColor "
<< "Planar Configuration " << PlanarConfiguration );
if ( ! IsRawRGB() )
{
// [Planar 2] OR [Photo D]: LUT intervention done outside
- gdcmStaticDebugMacro("--> RawRGB : LUT intervention done outside");
+ gdcmDebugMacro("--> RawRGB : LUT intervention done outside");
return;
}
if ( IsYBRFull )
{
// [Planar 1] AND [Photo C] (remember YBR_FULL_422 acts as RGB)
- gdcmStaticDebugMacro("--> YBRFull");
+ gdcmDebugMacro("--> YBRFull");
ConvertYcBcRPlanesToRGBPixels();
}
else
{
// [Planar 1] AND [Photo C]
- gdcmStaticDebugMacro("--> YBRFull");
+ gdcmDebugMacro("--> YBRFull");
ConvertRGBPlanesToRGBPixels();
}
return;
if (IsRLELossless)
{
- gdcmStaticDebugMacro("--> RLE Lossless");
+ gdcmDebugMacro("--> RLE Lossless");
ConvertRGBPlanesToRGBPixels();
}
}
else
{
- gdcmStaticWarningMacro("Set as RLE file but NO RLEinfo present.");
+ gdcmWarningMacro("Set as RLE file but NO RLEinfo present.");
}
}
}
else
{
- gdcmStaticWarningMacro("Set as JPEG file but NO JPEGinfo present.");
+ gdcmWarningMacro("Set as JPEG file but NO JPEGinfo present.");
}
}
}
+/**
+ * \brief CallStartMethod
+ */
+void PixelReadConvert::CallStartMethod()
+{
+ Progress = 0.0f;
+ Abort = false;
+ CommandManager::ExecuteCommand(FH,CMD_STARTPROGRESS);
+}
+
+/**
+ * \brief CallProgressMethod
+ */
+void PixelReadConvert::CallProgressMethod()
+{
+ CommandManager::ExecuteCommand(FH,CMD_PROGRESS);
+}
+
+/**
+ * \brief CallEndMethod
+ */
+void PixelReadConvert::CallEndMethod()
+{
+ Progress = 1.0f;
+ CommandManager::ExecuteCommand(FH,CMD_ENDPROGRESS);
+}
+
+
//-----------------------------------------------------------------------------
} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff