Program: gdcm
Module: $RCSfile: gdcmPixelReadConvert.cxx,v $
Language: C++
- Date: $Date: 2005/06/20 17:12:03 $
- Version: $Revision: 1.68 $
+ Date: $Date: 2005/07/01 11:25:51 $
+ Version: $Revision: 1.74 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
LutRedData = 0;
LutGreenData = 0;
LutBlueData = 0;
+ RLEInfo = 0;
+ JPEGInfo = 0;
}
/// Canonical Destructor
LutRedData = (uint8_t*)file->GetEntryBinArea( 0x0028, 0x1201 );
if ( ! LutRedData )
{
- gdcmWarningMacro( "Unable to read Red LUT data" );
+ gdcmWarningMacro( "Unable to read Red Palette Color Lookup Table data" );
}
// //// Green round:
LutGreenData = (uint8_t*)file->GetEntryBinArea(0x0028, 0x1202 );
if ( ! LutGreenData)
{
- gdcmWarningMacro( "Unable to read Green LUT data" );
+ gdcmWarningMacro( "Unable to read Green Palette Color Lookup Table data" );
}
// //// Blue round:
LutBlueData = (uint8_t*)file->GetEntryBinArea( 0x0028, 0x1203 );
if ( ! LutBlueData )
{
- gdcmWarningMacro( "Unable to read Blue LUT data" );
+ gdcmWarningMacro( "Unable to read Blue Palette Color Lookup Table data" );
}
}
}
fp->seekg( PixelOffset, std::ios::beg );
- if( fp->fail() || fp->eof())
+ if ( fp->fail() || fp->eof() )
{
gdcmWarningMacro( "Unable to find PixelOffset in file." );
return false;
AllocateRaw();
//////////////////////////////////////////////////
- //// Second stage: read from disk dans decompress.
+ //// Second stage: read from disk and decompress.
if ( BitsAllocated == 12 )
{
ReadAndDecompress12BitsTo16Bits( fp);
// after the field containing the image data. In this case, these
// bad data are added to the size of the image (in the PixelDataLength
// variable). But RawSize is the right size of the image !
- if( PixelDataLength != RawSize)
+ if ( PixelDataLength != RawSize )
{
gdcmWarningMacro( "Mismatch between PixelReadConvert : "
<< PixelDataLength << " and RawSize : " << RawSize );
}
- if( PixelDataLength > RawSize)
+ if ( PixelDataLength > RawSize )
{
fp->read( (char*)Raw, RawSize);
}
// The job can't be done
return false;
}
+
+ gdcmWarningMacro( "--> BuildRGBImage" );
// Build RGB Pixels
AllocateRGB();
int j;
- if( BitsAllocated <= 8)
+ if ( BitsAllocated <= 8 )
{
uint8_t *localRGB = RGB;
for (size_t i = 0; i < RawSize; ++i )
assert( !IsJPEGLossless || !IsJPEGLossy || !IsJPEGLS );
// FIXME this is really ugly but it seems I have to load the complete
// jpeg2000 stream to use jasper:
- // I don't think we'll ever be able to deal with multiple fragments properly
+ // I don't think we'll ever be able to deal with multiple fragments properly
unsigned long inputlength = 0;
JPEGFragment *jpegfrag = JPEGInfo->GetFirstFragment();
nbRead = sscanf( LutRedDescriptor.c_str(),
"%d\\%d\\%d",
&lengthR, &debR, &nbitsR );
- if( nbRead != 3 )
+ if ( nbRead != 3 )
{
gdcmWarningMacro( "Wrong Red LUT descriptor" );
}
nbRead = sscanf( LutGreenDescriptor.c_str(),
"%d\\%d\\%d",
&lengthG, &debG, &nbitsG );
- if( nbRead != 3 )
+ if ( nbRead != 3 )
{
gdcmWarningMacro( "Wrong Green LUT descriptor" );
}
nbRead = sscanf( LutRedDescriptor.c_str(),
"%d\\%d\\%d",
&lengthB, &debB, &nbitsB );
- if( nbRead != 3 )
+ if ( nbRead != 3 )
{
gdcmWarningMacro( "Wrong Blue LUT descriptor" );
}
if ( !lengthR ) // if = 2^16, this shall be 0 see : CP-143
lengthR=65536;
- if( !lengthG ) // if = 2^16, this shall be 0
+ if ( !lengthG ) // if = 2^16, this shall be 0
lengthG=65536;
if ( !lengthB ) // if = 2^16, this shall be 0
lengthB=65536;
// -------------------------------------------------------------
- if ( BitsAllocated <= 8)
+ if ( BitsAllocated <= 8 )
{
// forge the 4 * 8 Bits Red/Green/Blue/Alpha LUT
LutRGBA = new uint8_t[ 1024 ]; // 256 * 4 (R, G, B, Alpha)
//take "Subscript of the first Lut Value" (debR,debG,debB) into account!
+ //FIXME : +1 : to get 'low value' byte
+ // Trouble expected on Big Endian Processors ?
+ // 16 BIts Per Pixel Palette Color to be swapped?
+
a = LutRGBA + 0 + debR;
for( i=0; i < lengthR; ++i )
{
- *a = LutRedData[i*mult+1];
+ *a = LutRedData[i*mult+1];
a += 4;
}
*a = LutBlueData[i*mult+1];
a += 4;
}
-
+
a = LutRGBA + 3 ;
for(i=0; i < 256; ++i)
{
{
unsigned int i;
- if( BitsAllocated == 16 )
+ if ( BitsAllocated == 16 )
{
uint16_t *im16 = (uint16_t*)Raw;
switch( SwapCode )
gdcmWarningMacro("SwapCode value (16 bits) not allowed.");
}
}
- else if( BitsAllocated == 32 )
+ else if ( BitsAllocated == 32 )
{
uint32_t s32;
uint16_t high;
uint16_t *deb = (uint16_t *)Raw;
for(int i = 0; i<l; i++)
{
- if( *deb == 0xffff )
+ if ( *deb == 0xffff )
{
*deb = 0;
}
*/
bool PixelReadConvert::ConvertReArrangeBits() throw ( FormatError )
{
+
if ( BitsStored != BitsAllocated )
{
int l = (int)( RawSize / ( BitsAllocated / 8 ) );
if ( BitsAllocated == 16 )
{
- uint16_t mask = 0xffff;
- mask = mask >> ( BitsAllocated - BitsStored );
+ // pmask : to mask the 'unused bits' (may contain overlays)
+ uint16_t pmask = 0xffff;
+ pmask = pmask >> ( BitsAllocated - BitsStored );
+
uint16_t *deb = (uint16_t*)Raw;
- for(int i = 0; i<l; i++)
+
+ if ( !PixelSign ) // Pixels are unsigned
{
- *deb = (*deb >> (BitsStored - HighBitPosition - 1)) & mask;
- deb++;
+ for(int i = 0; i<l; i++)
+ {
+ *deb = (*deb >> (BitsStored - HighBitPosition - 1)) & pmask;
+ deb++;
+ }
+ }
+ else // Pixels are signed
+ {
+ // smask : to check the 'sign' when BitsStored != BitsAllocated
+ uint16_t smask = 0x0001;
+ smask = smask << ( 16 - (BitsAllocated - BitsStored + 1) );
+ // nmask : to propagate sign bit on negative values
+ int16_t nmask = (int16_t)0x8000;
+ nmask = nmask >> ( BitsAllocated - BitsStored - 1 );
+/*
+std::cout << "BitsStored " << BitsStored
+ << " BitsAllocated " << BitsAllocated
+ << std::endl;
+std::cout << std::hex << "pmask " << pmask
+ << " smask " << smask
+ << " nmask " << nmask
+ << std::endl;
+*/
+ for(int i = 0; i<l; i++)
+ {
+ *deb = *deb >> (BitsStored - HighBitPosition - 1);
+ if ( *deb & smask )
+ {
+ *deb = *deb | nmask;
+ }
+ else
+ {
+ *deb = *deb & pmask;
+ }
+ deb++;
+ }
}
}
else if ( BitsAllocated == 32 )
{
- uint32_t mask = 0xffffffff;
- mask = mask >> ( BitsAllocated - BitsStored );
+ // pmask : to mask the 'unused bits' (may contain overlays)
+ uint32_t pmask = 0xffffffff;
+ pmask = pmask >> ( BitsAllocated - BitsStored );
+
uint32_t *deb = (uint32_t*)Raw;
- for(int i = 0; i<l; i++)
+
+ if ( !PixelSign )
{
- *deb = (*deb >> (BitsStored - HighBitPosition - 1)) & mask;
- deb++;
+ for(int i = 0; i<l; i++)
+ {
+ *deb = (*deb >> (BitsStored - HighBitPosition - 1)) & pmask;
+ deb++;
+ }
+ }
+ else
+ {
+ // smask : to check the 'sign' when BitsStored != BitsAllocated
+ uint32_t smask = 0x00000001;
+ smask = smask >> ( 32 - (BitsAllocated - BitsStored +1 ));
+ // nmask : to propagate sign bit on negative values
+ int32_t nmask = 0x80000000;
+ nmask = nmask >> ( BitsAllocated - BitsStored -1 );
+
+ for(int i = 0; i<l; i++)
+ {
+ *deb = *deb >> (BitsStored - HighBitPosition - 1);
+ if ( *deb & smask )
+ *deb = *deb | nmask;
+ else
+ *deb = *deb & pmask;
+ deb++;
+ }
}
}
else
{
- gdcmWarningMacro("Weird image");
+ gdcmWarningMacro("Weird image (BitsAllocated !=8, 12, 16, 32)");
throw FormatError( "Weird image !?" );
}
}
*/
void PixelReadConvert::ConvertRGBPlanesToRGBPixels()
{
- gdcmWarningMacro("ConvertRGBPlanesToRGBPixels");
+ gdcmWarningMacro("--> ConvertRGBPlanesToRGBPixels");
uint8_t *localRaw = Raw;
uint8_t *copyRaw = new uint8_t[ RawSize ];
// except for the few patches of color on the image.
// On such images, RLE achieves a compression ratio that is much better
// than the compression ratio on an equivalent RGB image.
-
+
+ gdcmWarningMacro("--> ConvertYcBcRPlanesToRGBPixels");
+
uint8_t *localRaw = Raw;
uint8_t *copyRaw = new uint8_t[ RawSize ];
memmove( copyRaw, localRaw, RawSize );
/// http://lestourtereaux.free.fr/papers/data/yuvrgb.pdf
/// for code optimisation.
- gdcmWarningMacro("ConvertYcBcRPlanesToRGBPixels");
-
for ( int i = 0; i < nbFrames; i++ )
{
for ( int j = 0; j < l; j++ )
// - [Planar 1] AND [Photo C] handled with ConvertYcBcRPlanesToRGBPixels()
// - [Planar 2] OR [Photo D] requires LUT intervention.
- gdcmWarningMacro("ConvertHandleColor");
+ gdcmWarningMacro("--> ConvertHandleColor"
+ << "Planar Configuration " << PlanarConfiguration );
if ( ! IsRawRGB() )
{
// [Planar 2] OR [Photo D]: LUT intervention done outside
+ gdcmWarningMacro("--> RawRGB : LUT intervention done outside");
return;
}
if ( IsYBRFull )
{
// [Planar 1] AND [Photo C] (remember YBR_FULL_422 acts as RGB)
+ gdcmWarningMacro("--> YBRFull");
ConvertYcBcRPlanesToRGBPixels();
}
else
{
// [Planar 1] AND [Photo C]
+ gdcmWarningMacro("--> YBRFull");
ConvertRGBPlanesToRGBPixels();
}
return;
if (IsRLELossless)
{
+ gdcmWarningMacro("--> RLE Lossless");
ConvertRGBPlanesToRGBPixels();
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff