Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2004/10/12 04:35:46 $
- Version: $Revision: 1.139 $
+ Date: $Date: 2004/11/05 21:23:46 $
+ Version: $Revision: 1.152 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmFile.h"
#include "gdcmDebug.h"
-#include "gdcmPixelConvert.h"
+#include <fstream>
namespace gdcm
{
*/
void File::Initialise()
{
+ PixelConverter = NULL; //just in case
if ( HeaderInternal->IsReadable() )
{
ImageDataSizeRaw = ComputeDecompressedPixelDataSizeFromHeader();
{
ImageDataSize = ImageDataSizeRaw;
}
+
+ PixelConverter = new PixelConvert; //LEAK !
+ PixelConverter->GrabInformationsFromHeader( HeaderInternal );
}
SaveInitialValues();
}
HeaderInternal = 0;
DeleteInitialValues();
+ if( PixelConverter )
+ {
+ //delete PixelConverter;
+ }
+
}
/**
// 0028|1202 [US] [Green Palette Color Lookup Table Data]
// 0028|1203 [US] [Blue Palette Color Lookup Table Data]
- // Number of "Bits Allocated"
int numberBitsAllocated = HeaderInternal->GetBitsAllocated();
- if ( ( numberBitsAllocated == 0 ) || ( numberBitsAllocated == 12 ) )
+ // Number of "Bits Allocated" is fixed to 16 when:
+ // - it is not defined (i.e. it's value is 0)
+ // - it's 12, since we will expand the image to 16 bits (see
+ // PixelConvert::ConvertDecompress12BitsTo16Bits() )
+ if ( numberBitsAllocated == 0 || numberBitsAllocated == 12 )
{
numberBitsAllocated = 16;
}
*/
uint8_t* File::GetImageData()
{
- // FIXME (Mathieu)
- // I need to deallocate Pixel_Data before doing any allocation:
-
- if ( Pixel_Data )
- if ( LastAllocatedPixelDataLength != ImageDataSize )
- free(Pixel_Data);
- if ( !Pixel_Data )
- Pixel_Data = new uint8_t[ImageDataSize];
-
- if ( Pixel_Data )
+ if ( ! GetDecompressed() )
+ {
+ // If the decompression failed nothing can be done.
+ return 0;
+ }
+
+ uint8_t* pixelData;
+ if ( HeaderInternal->HasLUT() && PixelConverter->BuildRGBImage() )
+ {
+ pixelData = PixelConverter->GetRGB();
+ }
+ else
{
- LastAllocatedPixelDataLength = ImageDataSize;
+ // When no LUT or LUT conversion fails, return the decompressed
+ pixelData = PixelConverter->GetDecompressed();
+ }
- // we load the pixels (and transform grey level + LUT into RGB)
- GetImageDataIntoVector(Pixel_Data, ImageDataSize);
+// PIXELCONVERT CLEANME
+ // Restore the header in a disk-consistent state
+ // (if user asks twice to get the pixels from disk)
+ if ( PixelRead != -1 ) // File was "read" before
+ {
+ RestoreInitialValues();
+ }
+ if ( PixelConverter->GetRGB() )
+ {
+ // now, it's an RGB image
+ // Lets's write it in the Header
+ 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);
+ PixelRead = 0; // no PixelRaw
+ }
+ else
+ {
+ if ( HeaderInternal->HasLUT() )
+ {
+ // The LUT interpretation failed
+ std::string photometricInterpretation = "MONOCHROME1 ";
+ HeaderInternal->SetEntryByNumber( photometricInterpretation,
+ 0x0028, 0x0004 );
+ PixelRead = 0; // no PixelRaw
+ }
+ else
+ {
+ if ( PixelConverter->IsDecompressedRGB() )
+ {
+ ///////////////////////////////////////////////////
+ // now, it's an RGB image
+ // Lets's write it in the Header
+ // Droping Palette Color out of the Header
+ // has been moved to the Write process.
+ // TODO : move 'values' modification to the write process
+ // : save also (in order to be able to restore)
+ // : 'high bit' -when not equal to 'bits stored' + 1
+ // : 'bits allocated', when it's equal to 12 ?!
+ std::string spp = "3"; // Samples Per Pixel
+ std::string photInt = "RGB "; // Photometric Interpretation
+ std::string planConfig = "0"; // Planar Configuration
+ HeaderInternal->SetEntryByNumber(spp,0x0028,0x0002);
+ HeaderInternal->SetEntryByNumber(photInt,0x0028,0x0004);
+ HeaderInternal->SetEntryByNumber(planConfig,0x0028,0x0006);
+ }
+ PixelRead = 1; // PixelRaw
+ }
+ }
- // We say the value *is* loaded.
- GetHeader()->SetEntryByNumber( GDCM_BINLOADED,
- GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
+ // We say the value *is* loaded.
+ GetHeader()->SetEntryByNumber( GDCM_BINLOADED,
+ GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
- // Will be 7fe0, 0010 in standard case
- GetHeader()->SetEntryBinAreaByNumber( Pixel_Data,
- GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
- }
- PixelRead = 0; // no PixelRaw
+ // Will be 7fe0, 0010 in standard case
+ GetHeader()->SetEntryBinAreaByNumber( pixelData,
+ GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
+// END PIXELCONVERT CLEANME
- return Pixel_Data;
+ return pixelData;
}
/**
*/
size_t File::GetImageDataIntoVector (void* destination, size_t maxSize)
{
- GetImageDataIntoVectorRaw (destination, maxSize);
- PixelRead = 0 ; // =0 : no ImageDataRaw
- if ( !HeaderInternal->HasLUT() )
+ if ( ! GetDecompressed() )
{
- return ImageDataSize;
+ // If the decompression failed nothing can be done.
+ return 0;
}
-
- // 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 )
+ if ( HeaderInternal->HasLUT() && PixelConverter->BuildRGBImage() )
{
- int j;
- // move Gray pixels to temp area
- memmove(newDest, destination, ImageDataSizeRaw);
- for (size_t i=0; i<ImageDataSizeRaw; ++i)
+ if ( PixelConverter->GetRGBSize() > maxSize )
{
- // Build RGB Pixels
- j = newDest[i]*4;
- *a++ = lutRGBA[j];
- *a++ = lutRGBA[j+1];
- *a++ = lutRGBA[j+2];
+ dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger"
+ "than caller's expected MaxSize");
+ return 0;
}
- delete[] newDest;
-
- // now, it's an RGB image
- // Lets's write it in the Header
-
- // 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);
-
+ memmove( destination,
+ (void*)PixelConverter->GetRGB(),
+ PixelConverter->GetRGBSize() );
+ return PixelConverter->GetRGBSize();
}
- else // 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 !
- // Need to make RGB Pixels (?) from grey Pixels (?!) and Gray Lut (!?!)
- // It seems that *no Dicom Viewer* has any idea :-(
-
- std::string photomInterp = "MONOCHROME1 "; // Photometric Interpretation
- HeaderInternal->SetEntryByNumber(photomInterp,0x0028,0x0004);
- }
- /// \todo Drop Palette Color out of the Header?
- return ImageDataSize;
+ // Either no LUT conversion necessary or LUT conversion failed
+ if ( PixelConverter->GetDecompressedSize() > maxSize )
+ {
+ dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger"
+ "than caller's expected MaxSize");
+ return 0;
+ }
+ memmove( destination,
+ (void*)PixelConverter->GetDecompressed(),
+ PixelConverter->GetDecompressedSize() );
+ return PixelConverter->GetDecompressedSize();
}
/**
*/
uint8_t* File::GetImageDataRaw ()
{
- size_t imgDataSize;
- if ( HeaderInternal->HasLUT() )
- /// \todo Let Header user a chance to get the right value
- imgDataSize = ImageDataSizeRaw;
- else
- imgDataSize = ImageDataSize;
-
- // FIXME (Mathieu)
- // I need to deallocate Pixel_Data before doing any allocation:
-
- if ( Pixel_Data )
- if ( LastAllocatedPixelDataLength != imgDataSize )
- free(Pixel_Data);
- if ( !Pixel_Data )
- Pixel_Data = new uint8_t[imgDataSize];
-
- if ( Pixel_Data )
- {
- LastAllocatedPixelDataLength = imgDataSize;
-
- // we load the pixels ( grey level or RGB, but NO transformation)
- GetImageDataIntoVectorRaw(Pixel_Data, imgDataSize);
-
- // We say the value *is* loaded.
- GetHeader()->SetEntryByNumber( GDCM_BINLOADED,
- GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
-
- // will be 7fe0, 0010 in standard cases
- GetHeader()->SetEntryBinAreaByNumber(Pixel_Data,
- GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
- }
- PixelRead = 1; // PixelRaw
-
- return Pixel_Data;
-}
-
-/**
- * \brief Copies at most MaxSize bytes of pixel data to caller's
- * memory space.
- * \warning This function was designed to avoid people that want to build
- * a volume from an image stack to need first to get the image pixels
- * and then move them to the volume area.
- * It's absolutely useless for any VTK user since vtk chooses
- * to invert the lines of an image, that is the last line comes first
- * (for some axis related reasons?). Hence he will have
- * to load the image line by line, starting from the end.
- * VTK users hace to call GetImageData
- * \warning DOES NOT transform the Grey Plane + Palette Color (if any)
- * into a single RGB Pixels Plane
- * the (VTK) user will manage the palettes
- *
- * @param destination Address (in caller's memory space) at which the
- * pixel data should be copied
- * @param maxSize Maximum number of bytes to be copied. When MaxSize
- * is not sufficient to hold the pixel data the copy is not
- * executed (i.e. no partial copy).
- * @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)
-{
- // we save the initial values of the following
- // in order to be able to restore the header in a disk-consistent state
- // (if user asks twice to get the pixels from disk)
-
- if ( PixelRead != -1 ) // File was "read" before
- {
- RestoreInitialValues();
- }
-
- PixelRead = 1 ; // PixelRaw
-
- if ( ImageDataSize > maxSize )
- {
- dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger"
- "than caller's expected MaxSize");
- return (size_t)0;
- }
-
- ReadPixelData( destination );
-
- // Number of Bits Allocated for storing a Pixel
- int numberBitsAllocated = HeaderInternal->GetBitsAllocated();
- if ( numberBitsAllocated == 0 )
- {
- numberBitsAllocated = 16;
- }
-
- // Number of Bits actually used
- int numberBitsStored = HeaderInternal->GetBitsStored();
- if ( numberBitsStored == 0 )
+ uint8_t* decompressed = GetDecompressed();
+ if ( ! decompressed )
{
- numberBitsStored = numberBitsAllocated;
+ return 0;
}
- // High Bit Position
- int highBitPosition = HeaderInternal->GetHighBitPosition();
- if ( highBitPosition == 0 )
- {
- highBitPosition = numberBitsAllocated - 1;
- }
-
- bool signedPixel = HeaderInternal->IsSignedPixelData();
-
- PixelConvert::ConvertReorderEndianity(
- (uint8_t*) destination,
- ImageDataSize,
- numberBitsStored,
- numberBitsAllocated,
- HeaderInternal->GetSwapCode(),
- signedPixel );
-
- PixelConvert::ConvertReArrangeBits(
- (uint8_t*) destination,
- ImageDataSize,
- numberBitsStored,
- numberBitsAllocated,
- highBitPosition );
-
-#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() )
+// PIXELCONVERT CLEANME
+ // Restore the header in a disk-consistent state
+ // (if user asks twice to get the pixels from disk)
+ if ( PixelRead != -1 ) // File was "read" before
{
- return ImageDataSize;
+ RestoreInitialValues();
}
-
- // 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() )
+ if ( PixelConverter->IsDecompressedRGB() )
{
- return ImageDataSize;
+ ///////////////////////////////////////////////////
+ // now, it's an RGB image
+ // Lets's write it in the Header
+ // Droping Palette Color out of the Header
+ // has been moved to the Write process.
+ // TODO : move 'values' modification to the write process
+ // : save also (in order to be able to restore)
+ // : 'high bit' -when not equal to 'bits stored' + 1
+ // : 'bits allocated', when it's equal to 12 ?!
+ std::string spp = "3"; // Samples Per Pixel
+ std::string photInt = "RGB "; // Photometric Interpretation
+ std::string planConfig = "0"; // Planar Configuration
+ HeaderInternal->SetEntryByNumber(spp,0x0028,0x0002);
+ HeaderInternal->SetEntryByNumber(photInt,0x0028,0x0004);
+ HeaderInternal->SetEntryByNumber(planConfig,0x0028,0x0006);
}
- // When planConf is 0, pixels are allready in RGB
-
- if ( planConf == 1 )
- {
- uint8_t* newDest = new uint8_t[ImageDataSize];
- // Warning : YBR_FULL_422 acts as RGB
- if ( HeaderInternal->IsYBRFull() )
- {
- ConvertYcBcRPlanesToRGBPixels((uint8_t*)destination, newDest);
- }
- else
- {
- ConvertRGBPlanesToRGBPixels((uint8_t*)destination, newDest);
- }
- memmove(destination, newDest, ImageDataSize);
- delete[] newDest;
- }
-
-///////////////////////////////////////////////////
- // now, it's an RGB image
- // Lets's write it in the Header
+ // We say the value *is* loaded.
+ GetHeader()->SetEntryByNumber( GDCM_BINLOADED,
+ GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
- // Droping Palette Color out of the Header
- // has been moved to the Write process.
-
- // TODO : move 'values' modification to the write process
- // : save also (in order to be able to restore)
- // : 'high bit' -when not equal to 'bits stored' + 1
- // : 'bits allocated', when it's equal to 12 ?!
-
- std::string spp = "3"; // Samples Per Pixel
- std::string photInt = "RGB "; // Photometric Interpretation
- std::string planConfig = "0"; // Planar Configuration
-
- HeaderInternal->SetEntryByNumber(spp,0x0028,0x0002);
- HeaderInternal->SetEntryByNumber(photInt,0x0028,0x0004);
- HeaderInternal->SetEntryByNumber(planConfig,0x0028,0x0006);
+ // will be 7fe0, 0010 in standard cases
+ GetHeader()->SetEntryBinAreaByNumber( decompressed,
+ GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
- return ImageDataSize;
+ PixelRead = 1; // PixelRaw
+// END PIXELCONVERT CLEANME
+
+ return decompressed;
}
-/**
- * \brief Convert (Y plane, cB plane, cR plane) to RGB pixels
- * \warning Works on all the frames at a time
- */
-void File::ConvertYcBcRPlanesToRGBPixels(uint8_t* source,
- uint8_t* destination)
+uint8_t* File::GetDecompressed()
{
- // to see the tricks about YBR_FULL, YBR_FULL_422,
- // YBR_PARTIAL_422, YBR_ICT, YBR_RCT have a look at :
- // ftp://medical.nema.org/medical/dicom/final/sup61_ft.pdf
- // and be *very* affraid
- //
- int l = HeaderInternal->GetXSize() * HeaderInternal->GetYSize();
- int nbFrames = HeaderInternal->GetZSize();
-
- uint8_t* a = source;
- uint8_t* b = source + l;
- uint8_t* c = source + l + l;
- double R, G, B;
-
- /// \todo : Replace by the 'well known' integer computation
- /// counterpart. Refer to
- /// http://lestourtereaux.free.fr/papers/data/yuvrgb.pdf
- /// for code optimisation.
-
- for (int i = 0; i < nbFrames; i++)
+ uint8_t* decompressed = PixelConverter->GetDecompressed();
+ if ( ! decompressed )
{
- for (int j = 0; j < l; j++)
+ // The decompressed image migth not be loaded yet:
+ std::ifstream* fp = HeaderInternal->OpenFile();
+ PixelConverter->ReadAndDecompressPixelData( fp );
+ HeaderInternal->CloseFile();
+ decompressed = PixelConverter->GetDecompressed();
+ if ( ! decompressed )
{
- R = 1.164 *(*a-16) + 1.596 *(*c -128) + 0.5;
- G = 1.164 *(*a-16) - 0.813 *(*c -128) - 0.392 *(*b -128) + 0.5;
- B = 1.164 *(*a-16) + 2.017 *(*b -128) + 0.5;
-
- if (R < 0.0) R = 0.0;
- if (G < 0.0) G = 0.0;
- if (B < 0.0) B = 0.0;
- if (R > 255.0) R = 255.0;
- if (G > 255.0) G = 255.0;
- if (B > 255.0) B = 255.0;
-
- *(destination++) = (uint8_t)R;
- *(destination++) = (uint8_t)G;
- *(destination++) = (uint8_t)B;
- a++;
- b++;
- c++;
+ dbg.Verbose(0, "File::GetDecompressed: read/decompress of "
+ "pixel data apparently went wrong.");
+ return 0;
}
}
-}
-
-/**
- * \brief Convert (Red plane, Green plane, Blue plane) to RGB pixels
- * \warning Works on all the frames at a time
- */
-void File::ConvertRGBPlanesToRGBPixels(uint8_t* source,
- uint8_t* destination)
-{
- int l = HeaderInternal->GetXSize() * HeaderInternal->GetYSize() * HeaderInternal->GetZSize();
-
- uint8_t* a = source;
- uint8_t* b = source + l;
- uint8_t* c = source + l + l;
- for (int j = 0; j < l; j++)
- {
- *(destination++) = *(a++);
- *(destination++) = *(b++);
- *(destination++) = *(c++);
- }
+ return decompressed;
}
/**
bool File::WriteRawData(std::string const & fileName)
{
- FILE* fp1 = fopen(fileName.c_str(), "wb");
- if (fp1 == NULL)
+ std::ofstream fp1(fileName.c_str(), std::ios::out | std::ios::binary );
+ if (!fp1)
{
- printf("Fail to open (write) file [%s] \n", fileName.c_str());
+ dbg.Verbose(2, "Fail to open (write) file:", fileName.c_str());
return false;
}
- fwrite (Pixel_Data, ImageDataSize, 1, fp1);
- fclose (fp1);
+ fp1.write((char*)Pixel_Data, ImageDataSize);
+ fp1.close();
return true;
}
return false;
}
- FILE* fp1 = fopen(fileName.c_str(), "wb");
+ std::ofstream* fp1 = new std::ofstream(fileName.c_str(),
+ std::ios::out | std::ios::binary);
if (fp1 == NULL)
{
- printf("Failed to open (write) File [%s] \n", fileName.c_str());
+ dbg.Verbose(2, "Failed to open (write) File: " , fileName.c_str());
return false;
}
if ( type == ImplicitVR || type == ExplicitVR )
{
// writing Dicom File Preamble
- uint8_t* filePreamble = new uint8_t[128];
+ char filePreamble[128];
memset(filePreamble, 0, 128);
- fwrite(filePreamble, 128, 1, fp1);
- fwrite("DICM", 4, 1, fp1);
-
- delete[] filePreamble;
+ fp1->write(filePreamble, 128);
+ fp1->write("DICM", 4);
}
// --------------------------------------------------------------
HeaderInternal->SetEntryByNumber(columns, 0x0028, 0x0011);
}
// ----------------- End of Special Patch ----------------
-
- // fwrite(Pixel_Data, ImageDataSize, 1, fp1); // should be useless, now
- fclose (fp1);
+ fp1->close ();
+ delete fp1;
return true;
}
-//-----------------------------------------------------------------------------
-// Private
/**
- * \brief Read pixel data from disk (optionaly decompressing) into the
- * caller specified memory location.
- * @param destination where the pixel data should be stored.
- *
+ * \brief Access to the underlying \ref PixelConverter RGBA LUT
*/
-bool File::ReadPixelData(void* destination)
+uint8_t* File::GetLutRGBA()
{
- FILE* fp = HeaderInternal->OpenFile();
-
- if ( !fp )
- {
- return false;
- }
- if ( fseek(fp, HeaderInternal->GetPixelOffset(), SEEK_SET) == -1 )
- {
- HeaderInternal->CloseFile();
- return false;
- }
-
- if ( HeaderInternal->GetBitsAllocated() == 12 )
- {
- PixelConvert::ConvertDecompress12BitsTo16Bits(
- (uint8_t*)destination,
- HeaderInternal->GetXSize(),
- HeaderInternal->GetYSize(),
- fp);
- HeaderInternal->CloseFile();
- return true;
- }
-
- // ---------------------- Uncompressed File
- if ( !HeaderInternal->IsDicomV3() ||
- HeaderInternal->IsImplicitVRLittleEndianTransferSyntax() ||
- HeaderInternal->IsExplicitVRLittleEndianTransferSyntax() ||
- HeaderInternal->IsExplicitVRBigEndianTransferSyntax() ||
- HeaderInternal->IsDeflatedExplicitVRLittleEndianTransferSyntax() )
- {
- size_t ItemRead = fread(destination, HeaderInternal->GetPixelAreaLength(), 1, fp);
- HeaderInternal->CloseFile();
- if ( ItemRead != 1 )
- {
- return false;
- }
- else
- {
- return true;
- }
- }
-
- // ---------------------- Run Length Encoding
- if ( HeaderInternal->IsRLELossLessTransferSyntax() )
- {
- bool res = PixelConvert::ReadAndDecompressRLEFile(
- destination,
- HeaderInternal->GetXSize(),
- HeaderInternal->GetYSize(),
- HeaderInternal->GetZSize(),
- HeaderInternal->GetBitsAllocated(),
- &(HeaderInternal->RLEInfo),
- fp );
- HeaderInternal->CloseFile();
- return res;
- }
-
- // --------------- SingleFrame/Multiframe JPEG Lossless/Lossy/2000
- int numberBitsAllocated = HeaderInternal->GetBitsAllocated();
- if ( ( numberBitsAllocated == 0 ) || ( numberBitsAllocated == 12 ) )
- {
- numberBitsAllocated = 16;
- }
-
- bool res = PixelConvert::ReadAndDecompressJPEGFile(
- (uint8_t*)destination,
- HeaderInternal->GetXSize(),
- HeaderInternal->GetYSize(),
- HeaderInternal->GetBitsAllocated(),
- HeaderInternal->GetBitsStored(),
- HeaderInternal->GetSamplesPerPixel(),
- HeaderInternal->GetPixelSize(),
- HeaderInternal->IsJPEG2000(),
- HeaderInternal->IsJPEGLossless(),
- &(HeaderInternal->JPEGInfo),
- fp );
- HeaderInternal->CloseFile();
- return res;
+ return PixelConverter->GetLutRGBA();
}
} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff