Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2004/10/12 09:59:45 $
- Version: $Revision: 1.140 $
+ Date: $Date: 2004/10/20 14:30:40 $
+ Version: $Revision: 1.146 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
ImageDataSize = ImageDataSizeRaw;
}
-
-
-
- // Just in case some access to a Header element requires disk access:
- FILE* fp = HeaderInternal->OpenFile();
- // Number of Bits Allocated for storing a Pixel is defaulted to 16
- // when absent from the header.
- int numberBitsAllocated = HeaderInternal->GetBitsAllocated();
- if ( numberBitsAllocated == 0 )
- {
- numberBitsAllocated = 16;
- }
- PixelConverter.SetBitsAllocated( numberBitsAllocated );
-
- // Number of "Bits Stored" defaulted to number of "Bits Allocated"
- // when absent from the header.
- int numberBitsStored = HeaderInternal->GetBitsStored();
- if ( numberBitsStored == 0 )
- {
- numberBitsStored = numberBitsAllocated;
- }
- PixelConverter.SetBitsStored( numberBitsStored );
-
- // High Bit Position
- int highBitPosition = HeaderInternal->GetHighBitPosition();
- if ( highBitPosition == 0 )
- {
- highBitPosition = numberBitsAllocated - 1;
- }
- PixelConverter.SetHighBitPosition( highBitPosition );
-
-
- PixelConverter.SetXSize( HeaderInternal->GetXSize() );
- PixelConverter.SetYSize( HeaderInternal->GetYSize() );
- PixelConverter.SetZSize( HeaderInternal->GetZSize() );
- PixelConverter.SetSamplesPerPixel( HeaderInternal->GetSamplesPerPixel() );
- PixelConverter.SetPixelSize( HeaderInternal->GetPixelSize() );
- PixelConverter.SetPixelSign( HeaderInternal->IsSignedPixelData() );
- PixelConverter.SetSwapCode( HeaderInternal->GetSwapCode() );
- PixelConverter.SetIsUncompressed(
- ! HeaderInternal->IsDicomV3()
- || HeaderInternal->IsImplicitVRLittleEndianTransferSyntax()
- || HeaderInternal->IsExplicitVRLittleEndianTransferSyntax()
- || HeaderInternal->IsExplicitVRBigEndianTransferSyntax()
- || HeaderInternal->IsDeflatedExplicitVRLittleEndianTransferSyntax() );
- PixelConverter.SetIsJPEG2000( HeaderInternal->IsJPEG2000() );
- PixelConverter.SetIsJPEGLossless( HeaderInternal->IsJPEGLossless() );
- PixelConverter.SetIsRLELossless(
- HeaderInternal->IsRLELossLessTransferSyntax() );
- PixelConverter.SetPixelOffset( HeaderInternal->GetPixelOffset() );
- PixelConverter.SetPixelDataLength( HeaderInternal->GetPixelAreaLength() );
- PixelConverter.SetRLEInfo( &(HeaderInternal->RLEInfo) );
- PixelConverter.SetJPEGInfo( &(HeaderInternal->JPEGInfo) );
- PixelConverter.SetDecompressedSize( ImageDataSize );
-
- HeaderInternal->CloseFile();
-
+ PixelConverter = new PixelConvert;
+ PixelConverter->GrabInformationsFromHeader( HeaderInternal );
}
SaveInitialValues();
}
return ImageDataSize;
}
- // from Lut R + Lut G + Lut B
- uint8_t *newDest = new uint8_t[ImageDataSize];
- uint8_t *a = (uint8_t *)destination;
- uint8_t *lutRGBA = HeaderInternal->GetLUTRGBA();
-
- if ( lutRGBA )
+ FILE* fp = HeaderInternal->OpenFile();
+ if ( PixelConverter->BuildRGBImage( fp ) )
{
- int j;
- // move Gray pixels to temp area
- memmove(newDest, destination, ImageDataSizeRaw);
- for (size_t i=0; i<ImageDataSizeRaw; ++i)
- {
- // Build RGB Pixels
- j = newDest[i]*4;
- *a++ = lutRGBA[j];
- *a++ = lutRGBA[j+1];
- *a++ = lutRGBA[j+2];
- }
- delete[] newDest;
+ memmove( destination,
+ (void*)PixelConverter->GetRGB(),
+ PixelConverter->GetRGBSize() );
- // now, it's an RGB image
- // Lets's write it in the Header
+ // now, it's an RGB image
+ // Lets's write it in the Header
- // FIXME : Better use CreateOrReplaceIfExist ?
+ // FIXME : Better use CreateOrReplaceIfExist ?
- std::string spp = "3"; // Samples Per Pixel
- HeaderInternal->SetEntryByNumber(spp,0x0028,0x0002);
- std::string rgb = "RGB "; // Photometric Interpretation
- HeaderInternal->SetEntryByNumber(rgb,0x0028,0x0004);
- std::string planConfig = "0"; // Planar Configuration
- HeaderInternal->SetEntryByNumber(planConfig,0x0028,0x0006);
+ std::string spp = "3"; // Samples Per Pixel
+ HeaderInternal->SetEntryByNumber(spp,0x0028,0x0002);
+ std::string rgb = "RGB "; // Photometric Interpretation
+ HeaderInternal->SetEntryByNumber(rgb,0x0028,0x0004);
+ std::string planConfig = "0"; // Planar Configuration
+ HeaderInternal->SetEntryByNumber(planConfig,0x0028,0x0006);
}
- else // GetLUTRGBA() failed
+ else
{
+ // PixelConverter->BuildRGBImage() failed probably because
+ // PixelConverter->GetLUTRGBA() failed:
// (gdcm-US-ALOKA-16.dcm), contains Segmented xxx Palette Color
// that are *more* than 65535 long ?!?
// No idea how to manage such an image !
std::string photomInterp = "MONOCHROME1 "; // Photometric Interpretation
HeaderInternal->SetEntryByNumber(photomInterp,0x0028,0x0004);
}
+ HeaderInternal->CloseFile();
/// \todo Drop Palette Color out of the Header?
return ImageDataSize;
* @return On success, the number of bytes actually copied. Zero on
* failure e.g. MaxSize is lower than necessary.
*/
-size_t File::GetImageDataIntoVectorRaw (void* destination, size_t maxSize)
+void File::GetImageDataIntoVectorRaw (void* destination, size_t maxSize)
{
// we save the initial values of the following
// in order to be able to restore the header in a disk-consistent state
{
dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger"
"than caller's expected MaxSize");
- return (size_t)0;
+ return;
}
FILE* fp = HeaderInternal->OpenFile();
- PixelConverter.ReadAndDecompressPixelData( destination, fp );
+ PixelConverter->ReadAndDecompressPixelData( fp );
HeaderInternal->CloseFile();
-
- PixelConverter.ReorderEndianity( (uint8_t*) destination );
-
- PixelConverter.ReArrangeBits( (uint8_t*) destination );
-
-#ifdef GDCM_DEBUG
- FILE* DebugFile;
- DebugFile = fopen( "SpuriousFile.RAW", "wb" );
- fwrite( PixelConvertor.GetUncompressed(),
- PixelConvertor.GetUncompressedsSize(),
- 1, DebugFile );
- fclose( DebugFile );
-#endif //GDCM_DEBUG
-
-// SPLIT ME
-//////////////////////////////////
-// Deal with the color
-
- // Monochrome pictures don't require color intervention
- if ( HeaderInternal->IsMonochrome() )
- {
- return ImageDataSize;
- }
-
- // Planar configuration = 0 : Pixels are already RGB
- // Planar configuration = 1 : 3 planes : R, G, B
- // Planar configuration = 2 : 1 gray Plane + 3 LUT
-
- // Well ... supposed to be !
- // See US-PAL-8-10x-echo.dcm: PlanarConfiguration=0,
- // PhotometricInterpretation=PALETTE COLOR
- // and heuristic has to be found :-(
-
- int planConf = HeaderInternal->GetPlanarConfiguration();
-
- // Planar configuration = 2 ==> 1 gray Plane + 3 LUT
- // ...and...
- // whatever the Planar Configuration might be, "PALETTE COLOR "
- // implies that we deal with the palette.
- if ( ( planConf == 2 ) || HeaderInternal->IsPaletteColor() )
- {
- return ImageDataSize;
- }
-
- // When planConf is 0, pixels are allready in RGB
+ memmove( destination,
+ (void*)PixelConverter->GetDecompressed(),
+ PixelConverter->GetDecompressedSize() );
- if ( planConf == 1 )
+ if ( ! PixelConverter->IsDecompressedRGB() )
{
- // Warning : YBR_FULL_422 acts as RGB
- if ( HeaderInternal->IsYBRFull() )
- {
- PixelConverter.ConvertYcBcRPlanesToRGBPixels(
- (uint8_t*)destination,
- ImageDataSize );
- }
- else
- {
- PixelConverter.ConvertRGBPlanesToRGBPixels(
- (uint8_t*)destination,
- ImageDataSize );
- }
-
+ return;
}
///////////////////////////////////////////////////
HeaderInternal->SetEntryByNumber(photInt,0x0028,0x0004);
HeaderInternal->SetEntryByNumber(planConfig,0x0028,0x0006);
- return ImageDataSize;
+ return;
}
/**
return true;
}
+/**
+ * \brief Access to the underlying \ref PixelConverter RGBA LUT
+ */
+uint8_t* File::GetLutRGBA()
+{
+ return PixelConverter->GetLutRGBA();
+}
+
} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff