+2004-11-25 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+ * src/gdcmDocument.cxx : fix bug... test if the fp is opened to use it
+ * src/gdcmPixelConvert.cxx : calculate the image size when while the grab of
+ the header.
+ * src/gdcmFile.[h|cxx] : remove PixelRead and ImageDataSizeRaw variables and
+ some corresponding methods. Write correctly the file and check before
+ write
+ * Test/TestCopyDicom.cxx, TestReadWriteReadCompare.cxx,
+ TestAllReadCompareDicom.cxx : pass the write of images to RGB and test
+ is now on RGB datas (as before my last commit
+ * Example/PrintHeader.cxx, PrintFile.cxx : repad files.
+
2004-11-24 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
* src/gdcmBinEntry.cxx, gdcmSeqEntry.cxx, gdcmSQItem.cxx, gdcmValEntry.cxx :
Add a print information of the type of the entry
Program: gdcm
Module: $RCSfile: PrintFile.cxx,v $
Language: C++
- Date: $Date: 2004/11/24 16:39:17 $
- Version: $Revision: 1.13 $
+ Date: $Date: 2004/11/25 10:24:33 $
+ Version: $Revision: 1.14 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
int main(int argc, char* argv[])
{
-
gdcm::Header *e1;
gdcm::File *f1;
std::string fileName;
- if (argc != 2) {
+ if (argc != 2)
+ {
std::cout << " usage : PrintDocument fileName" << std::endl;
}
- if (argc > 1) {
+ if (argc > 1)
+ {
fileName=argv[1];
- } else {
+ }
+ else
+ {
fileName += GDCM_DATA_ROOT;
fileName += "/test.acr";
}
e1= new gdcm::Header( fileName.c_str() );
-
f1 = new gdcm::File(e1);
e1->SetPrintLevel(2);
-
e1->Print();
-
+
std::cout << "\n\n" << std::endl;
- int dataSize = f1->GetImageDataSize();
std::cout <<std::endl;
- std::cout <<" dataSize " << dataSize << std::endl;
- std::cout <<" dataSizeRaw " << f1->GetImageDataSizeRaw() << std::endl;
+ std::cout <<" dataSize " << f1->GetImageDataSize() << std::endl;
+ std::cout <<" dataSizeRaw " << f1->GetImageDataRawSize() << std::endl;
+
int nX,nY,nZ,sPP,planarConfig;
std::string pixelType;
nX=e1->GetXSize();
<< std::endl;
- if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) {
- std::cout << "Transfert Syntax not loaded. " << std::endl
- << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
- << std::endl;
+ if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED )
+ {
+ std::cout << "Transfert Syntax not loaded. " << std::endl
+ << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
+ << std::endl;
return 0;
- }
+ }
std::string transferSyntaxName = e1->GetTransfertSyntaxName();
std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
&& transferSyntaxName != "Deflated Explicit VR - Little Endian"
&& transferSyntaxName != "Explicit VR - Big Endian"
&& transferSyntaxName != "Uncompressed ACR-NEMA" )
- {
+ {
std::cout << std::endl << "==========================================="
<< std::endl;
f1->GetPixelConverter()->Print();
std::cout << std::endl << "==========================================="
<< std::endl;
- }
+ }
if(e1->IsReadable())
std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;
Program: gdcm
Module: $RCSfile: PrintHeader.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:26:18 $
- Version: $Revision: 1.9 $
+ Date: $Date: 2004/11/25 10:24:33 $
+ Version: $Revision: 1.10 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
fileName += GDCM_DATA_ROOT;
fileName += "/test.acr";
}
-
- gdcm::File *e2 = new gdcm::File( fileName.c_str() );
- gdcm::Header *e1 = e2->GetHeader();
-
- if (argc > 2) {
+
+ gdcm::File *f1 = new gdcm::File( fileName.c_str() );
+ gdcm::Header *e1 = f1->GetHeader();
+
+ if (argc > 2)
+ {
int level = atoi(argv[2]);
e1->SetPrintLevel(level);
}
- e1->Print();
-
- std::cout << "\n\n" << std::endl;
-
- if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) {
- std::cout << "Transfert Syntax not loaded. " << std::endl
- << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
- << std::endl;
- return 0;
- }
-
- std::string transferSyntaxName = e1->GetTransfertSyntaxName();
- std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
-
+ e1->Print();
+
+ std::cout << "\n\n" << std::endl;
+
+ if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED )
+ {
+ std::cout << "Transfert Syntax not loaded. " << std::endl
+ << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
+ << std::endl;
+ return 0;
+ }
+
+ std::string transferSyntaxName = e1->GetTransfertSyntaxName();
+ std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
+
if ( transferSyntaxName != "Implicit VR - Little Endian"
&& transferSyntaxName != "Explicit VR - Little Endian"
&& transferSyntaxName != "Deflated Explicit VR - Little Endian"
&& transferSyntaxName != "Explicit VR - Big Endian"
&& transferSyntaxName != "Uncompressed ACR-NEMA" )
- {
- std::cout << std::endl << "==========================================="
- << std::endl;
- e2->GetPixelConverter()->Print();
- std::cout << std::endl << "==========================================="
- << std::endl;
- }
-
+ {
+ std::cout << std::endl << "==========================================="
+ << std::endl;
+ f1->GetPixelConverter()->Print();
+ std::cout << std::endl << "==========================================="
+ << std::endl;
+ }
+
if(e1->IsReadable())
std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;
else
delete e1;
return 0;
-
}
Program: gdcm
Module: $RCSfile: TestAllReadCompareDicom.cxx,v $
Language: C++
- Date: $Date: 2004/11/24 16:39:18 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2004/11/25 10:24:33 $
+ Version: $Revision: 1.19 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
FILE* testFILE = fopen( referenceFileName.c_str(), "r" );
if (! testFILE )
{
- uint8_t* testedImageData = tested->GetImageDataRaw(); // Kludge
+ uint8_t* testedImageData = tested->GetImageData(); // Kludge
(void)testedImageData;
+ tested->SetWriteModeToRGB();
tested->WriteDcmExplVR( referenceFileName );
}
else
////// Step 3b:
std::cout << "3b...";
- int testedDataSize = tested->GetImageDataSizeRaw();
- uint8_t* testedImageData = tested->GetImageDataRaw();
+ int testedDataSize = tested->GetImageDataSize();
+ uint8_t* testedImageData = tested->GetImageData();
- int referenceDataSize = reference->GetImageDataSizeRaw();
- uint8_t* referenceImageData = reference->GetImageDataRaw();
+ int referenceDataSize = reference->GetImageDataSize();
+ uint8_t* referenceImageData = reference->GetImageData();
if (testedDataSize != referenceDataSize)
{
Program: gdcm
Module: $RCSfile: TestCopyDicom.cxx,v $
Language: C++
- Date: $Date: 2004/11/25 08:14:58 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2004/11/25 10:24:33 $
+ Version: $Revision: 1.22 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//////////////// Step 1:
std::cout << " 1...";
- gdcm::File *original = new gdcm::File( filename );
- gdcm::File *copy = new gdcm::File( output );
-
- size_t dataSize = original->GetImageDataSizeRaw();
- uint8_t* imageData = original->GetImageDataRaw();
- (void)dataSize; // To use the variable and not have warnings at compil.
- (void)imageData; // To use the variable and not have warnings at compil.
+ gdcm::Header *originalH = new gdcm::Header( filename );
+ gdcm::Header *copyH = new gdcm::Header( output );
//First of all copy the header field by field
//////////////// Step 2:
std::cout << "2...";
- original->GetHeader()->Initialize();
- gdcm::DocEntry* d=original->GetHeader()->GetNextEntry();
+ originalH->Initialize();
+ gdcm::DocEntry* d=originalH->GetNextEntry();
while(d)
{
if ( gdcm::BinEntry* b = dynamic_cast<gdcm::BinEntry*>(d) )
{
- copy->GetHeader()->ReplaceOrCreateByNumber(
+ copyH->ReplaceOrCreateByNumber(
b->GetBinArea(),
b->GetLength(),
b->GetGroup(),
}
else if ( gdcm::ValEntry* v = dynamic_cast<gdcm::ValEntry*>(d) )
{
- copy->GetHeader()->ReplaceOrCreateByNumber(
+ copyH->ReplaceOrCreateByNumber(
v->GetValue(),
v->GetGroup(),
v->GetElement(),
// << std::endl;
}
- d=original->GetHeader()->GetNextEntry();
+ d=originalH->GetNextEntry();
}
+ gdcm::File *original = new gdcm::File( originalH );
+ gdcm::File *copy = new gdcm::File( copyH );
+
+ size_t dataSize = original->GetImageDataSize();
+ uint8_t* imageData = original->GetImageData();
// Useless to set the image datas, because it's already made when
// copying the corresponding BinEntry that contains the pixel datas
//////////////// Step 3:
std::cout << "3...";
- copy->WriteDcmExplVR( output );
+ copy->SetWriteModeToRGB();
+ if( !copy->WriteDcmExplVR(output) )
+ {
+ std::cout << " Failed" << std::endl
+ << " " << output << " not written" << std::endl;
+
+ delete original;
+ delete copy;
+ delete originalH;
+ delete copyH;
+
+ return 1;
+ }
delete copy;
+ delete copyH;
//////////////// Step 4:
std::cout << "4...";
//Is the file written still gdcm parsable ?
if ( !copy->GetHeader()->IsReadable() )
{
- std::cout << "=> " << output << " Failed" << std::endl;
+ std::cout << " Failed" << std::endl
+ << " " << output << " not readable" << std::endl;
+
delete original;
- return(1);
+ delete originalH;
+
+ return 1;
}
//////////////// Step 5:
std::cout << "5...";
- size_t dataSizeWritten = copy->GetImageDataSizeRaw();
- uint8_t* imageDataWritten = copy->GetImageDataRaw();
+ size_t dataSizeWritten = copy->GetImageDataSize();
+ uint8_t* imageDataWritten = copy->GetImageData();
if (dataSize != dataSizeWritten)
{
std::cout << " Failed" << std::endl
- << " Pixel areas lengths differ: "
- << dataSize << " # " << dataSizeWritten << std::endl;
+ << " Pixel areas lengths differ: "
+ << dataSize << " # " << dataSizeWritten << std::endl;
delete original;
delete copy;
+ delete originalH;
return 1;
}
{
(void)res;
std::cout << " Failed" << std::endl
- << " Pixel differ (as expanded in memory)." << std::endl;
+ << " Pixel differ (as expanded in memory)." << std::endl;
delete original;
delete copy;
+ delete originalH;
return 1;
}
delete original;
delete copy;
+ delete originalH;
return 0;
}
filename += "/"; //doh!
filename += gdcmDataImages[i];
-// std::string output = "../Testing/Temporary/output.dcm";
std::string output = "output.dcm";
if( CopyDicom( filename, output ) != 0 )
Program: gdcm
Module: $RCSfile: TestReadWriteReadCompare.cxx,v $
Language: C++
- Date: $Date: 2004/11/24 16:39:18 $
- Version: $Revision: 1.15 $
+ Date: $Date: 2004/11/25 10:24:34 $
+ Version: $Revision: 1.16 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//////////////// Step 2:
gdcm::File* file = new gdcm::File( header );
- int dataSize = file->GetImageDataSizeRaw();
- uint8_t* imageData = file->GetImageDataRaw(); //EXTREMELY IMPORTANT
+ int dataSize = file->GetImageDataSize();
+ uint8_t* imageData = file->GetImageData(); //EXTREMELY IMPORTANT
// Sure, it is : It's up to the user to decide if he wants to
// GetImageData or if he wants to GetImageDataRaw
// (even if we do it by setting a flag, he will have to decide)
}
std::cout << "3...";
// For the next step:
- int dataSizeWritten = reread->GetImageDataSizeRaw();
- uint8_t* imageDataWritten = reread->GetImageDataRaw();
+ int dataSizeWritten = reread->GetImageDataSize();
+ uint8_t* imageDataWritten = reread->GetImageData();
//////////////// Step 4:
Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2004/11/24 16:39:18 $
- Version: $Revision: 1.137 $
+ Date: $Date: 2004/11/25 10:24:34 $
+ Version: $Revision: 1.138 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
void Document::LoadDocEntrySafe(DocEntry * entry)
{
- long PositionOnEntry = Fp->tellg();
- LoadDocEntry(entry);
- Fp->seekg(PositionOnEntry, std::ios_base::beg);
+ if(Fp)
+ {
+ long PositionOnEntry = Fp->tellg();
+ LoadDocEntry(entry);
+ Fp->seekg(PositionOnEntry, std::ios_base::beg);
+ }
}
/**
Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2004/11/24 16:39:18 $
- Version: $Revision: 1.162 $
+ Date: $Date: 2004/11/25 10:24:34 $
+ Version: $Revision: 1.163 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
if ( HeaderInternal->IsReadable() )
{
- ImageDataSizeRaw = ComputeDecompressedPixelDataSizeFromHeader();
- if ( HeaderInternal->HasLUT() )
- {
- ImageDataSize = 3 * ImageDataSizeRaw;
- }
- else
- {
- ImageDataSize = ImageDataSizeRaw;
- }
-
PixelConverter->GrabInformationsFromHeader( HeaderInternal );
}
- SaveInitialValues();
+ Pixel_Data = 0;
+ ImageDataSize = 0;
}
/**
HeaderInternal = 0;
}
-/**
- * \brief Sets some initial values for the Constructor
- * \warning not end user intended
- */
-void File::SaveInitialValues()
-{
- PixelRead = -1; // no ImageData read yet.
- Pixel_Data = 0;
-}
-
//-----------------------------------------------------------------------------
// Print
//-----------------------------------------------------------------------------
// Public
-
/**
- * \brief computes the length (in bytes) we must ALLOCATE to receive the
- * image(s) pixels (multiframes taken into account)
- * \warning : it is NOT the group 7FE0 length
- * (no interest for compressed images).
+ * \brief Get the size of the image data
+ *
+ * If the image can be RGB (with a lut or by default), the size
+ * corresponds to the RGB image
+ * @return The image size
*/
-int File::ComputeDecompressedPixelDataSizeFromHeader()
-{
- // see PS 3.3-2003 : C.7.6.3.2.1
- //
- // MONOCHROME1
- // MONOCHROME2
- // PALETTE COLOR
- // RGB
- // HSV (Retired)
- // ARGB (Retired)
- // CMYK (Retired)
- // YBR_FULL
- // YBR_FULL_422 (no LUT, no Palette)
- // YBR_PARTIAL_422
- // YBR_ICT
- // YBR_RCT
-
- // LUT's
- // ex : gdcm-US-ALOKA-16.dcm
- // 0028|1221 [OW] [Segmented Red Palette Color Lookup Table Data]
- // 0028|1222 [OW] [Segmented Green Palette Color Lookup Table Data]
- // 0028|1223 [OW] [Segmented Blue Palette Color Lookup Table Data]
-
- // ex : OT-PAL-8-face.dcm
- // 0028|1201 [US] [Red Palette Color Lookup Table Data]
- // 0028|1202 [US] [Green Palette Color Lookup Table Data]
- // 0028|1203 [US] [Blue Palette Color Lookup Table Data]
-
- int numberBitsAllocated = HeaderInternal->GetBitsAllocated();
- // 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;
- }
-
- int DecompressedSize = HeaderInternal->GetXSize()
- * HeaderInternal->GetYSize()
- * HeaderInternal->GetZSize()
- * ( numberBitsAllocated / 8 )
- * HeaderInternal->GetSamplesPerPixel();
-
- return DecompressedSize;
-}
-
-/// Accessor to \ref ImageDataSize
size_t File::GetImageDataSize()
{
- if ( ! GetDecompressed() )
- {
- // If the decompression failed nothing can be done.
- return 0;
- }
-
- if ( HeaderInternal->HasLUT() && PixelConverter->BuildRGBImage() )
- {
- return PixelConverter->GetRGBSize();
- }
- else
- {
- // When no LUT or LUT conversion fails, return the decompressed
- return PixelConverter->GetDecompressedSize();
- }
+ return PixelConverter->GetRGBSize();
}
-/// Accessor to \ref ImageDataSizeRaw
-size_t File::GetImageDataSizeRaw()
+/**
+ * \brief Get the size of the image data
+ *
+ * If the image can be RGB by transformation in a LUT, this
+ * transformation isn't considered
+ * @return The raw image size
+ */
+size_t File::GetImageDataRawSize()
{
- if ( ! GetDecompressed() )
- {
- // If the decompression failed nothing can be done.
- return 0;
- }
return PixelConverter->GetDecompressedSize();
}
// If the decompression failed nothing can be done.
return 0;
}
-
+
if ( HeaderInternal->HasLUT() && PixelConverter->BuildRGBImage() )
{
return PixelConverter->GetRGB();
// The decompressed image migth not be loaded yet:
std::ifstream* fp = HeaderInternal->OpenFile();
PixelConverter->ReadAndDecompressPixelData( fp );
- if(fp) HeaderInternal->CloseFile();
+ if(fp)
+ HeaderInternal->CloseFile();
+
decompressed = PixelConverter->GetDecompressed();
if ( ! decompressed )
{
- dbg.Verbose(0, "File::GetDecompressed: read/decompress of "
- "pixel data apparently went wrong.");
+ dbg.Verbose(0, "File::GetDecompressed: read/decompress of "
+ "pixel data apparently went wrong.");
return 0;
}
}
*/
bool File::SetImageData(uint8_t* inData, size_t expectedSize)
{
- HeaderInternal->SetImageDataSize( expectedSize );
// FIXME : if already allocated, memory leak !
Pixel_Data = inData;
- ImageDataSize = ImageDataSizeRaw = expectedSize;
- PixelRead = 1;
+ ImageDataSize = expectedSize;
// FIXME : 7fe0, 0010 IS NOT set ...
return true;
}
return(false);
}
+/**
+ * \brief Access to the underlying \ref PixelConverter RGBA LUT
+ */
+uint8_t* File::GetLutRGBA()
+{
+ return PixelConverter->GetLutRGBA();
+}
+
//-----------------------------------------------------------------------------
// Protected
/**
*/
bool File::WriteBase (std::string const & fileName, FileType type)
{
-/* if ( PixelRead == -1 && type != ExplicitVR)
- {
- return false;
- }*/
-
std::ofstream* fp1 = new std::ofstream(fileName.c_str(),
std::ios::out | std::ios::binary);
if (fp1 == NULL)
SetWriteToLibido();
}*/
// ----------------- End of Special Patch ----------------
-
- HeaderInternal->Write(fp1, type);
+
+ bool check=CheckWriteIntegrity();
+ if(check)
+ {
+ HeaderInternal->Write(fp1,type);
+ }
// --------------------------------------------------------------
// Special Patch to allow gdcm to re-write ACR-LibIDO formated images
RestoreWrite();
-
- fp1->close ();
+ fp1->close();
delete fp1;
- return true;
+ return check;
}
/**
- * \brief Access to the underlying \ref PixelConverter RGBA LUT
- */
-uint8_t* File::GetLutRGBA()
-{
- return PixelConverter->GetLutRGBA();
-}
-
-//-----------------------------------------------------------------------------
-// Private
-/**
- * \brief Set the pixel datas in the good entry of the Header
+ * \brief Check the write integrity
+ *
+ * The tests made are :
+ * - verify the size of the image to write with the possible write
+ * when the user set an image data
+ * @return true if the check successfulls
*/
-void File::SetPixelData(uint8_t* data)
+bool File::CheckWriteIntegrity()
{
- GetHeader()->SetEntryByNumber( GDCM_BINLOADED,
- GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
-
- // Will be 7fe0, 0010 in standard case
- DocEntry* currentEntry = GetHeader()->GetDocEntryByNumber(GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
- if ( currentEntry )
+ if(Pixel_Data)
{
- if ( BinEntry* binEntry = dynamic_cast<BinEntry *>(currentEntry) )
- // Flag is to false because datas are kept in the gdcmPixelConvert
- binEntry->SetBinArea( data, false );
+ switch(WriteMode)
+ {
+ case WMODE_NATIVE :
+ break;
+ case WMODE_DECOMPRESSED :
+ if(GetImageDataRawSize()!=ImageDataSize)
+ {
+ std::cerr<<"RAW : "<<GetImageDataRawSize()<<" / "<<ImageDataSize<<std::endl;
+ return false;
+ }
+ break;
+ case WMODE_RGB :
+ if(GetImageDataSize()!=ImageDataSize)
+ {
+ std::cerr<<"RGB : "<<GetImageDataSize()<<" / "<<ImageDataSize<<std::endl;
+ return false;
+ }
+ break;
+ }
}
+
+ return true;
}
void File::SetWriteToNative()
{
-// Nothing to do
+ if(Pixel_Data)
+ {
+ BinEntry* pixel = CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel());
+ pixel->SetValue(GDCM_BINLOADED);
+ pixel->SetBinArea(Pixel_Data,false);
+ pixel->SetLength(ImageDataSize);
+
+ Archive->Push(pixel);
+ }
}
void File::SetWriteToDecompressed()
void File::SetWriteToRGB()
{
- if(HeaderInternal->GetNumberOfScalarComponents()==3 && !HeaderInternal->HasLUT())
+ if(HeaderInternal->GetNumberOfScalarComponents()==3)
{
PixelConverter->BuildRGBImage();
Archive->Push(photInt);
Archive->Push(pixel);
+ // Remove any LUT
+ Archive->Push(0x0028,0x1101);
+ Archive->Push(0x0028,0x1102);
+ Archive->Push(0x0028,0x1103);
+ Archive->Push(0x0028,0x1201);
+ Archive->Push(0x0028,0x1202);
+ Archive->Push(0x0028,0x1203);
+
// For old ACR-NEMA
// Thus, we have a RGB image and the bits allocated = 24 and
// samples per pixels = 1 (in the read file)
Archive->Restore(0x0028,0x0100);
Archive->Restore(0x0028,0x0101);
Archive->Restore(0x0028,0x0102);
+
+ // For the LUT
+ Archive->Restore(0x0028,0x1101);
+ Archive->Restore(0x0028,0x1102);
+ Archive->Restore(0x0028,0x1103);
+ Archive->Restore(0x0028,0x1201);
+ Archive->Restore(0x0028,0x1202);
+ Archive->Restore(0x0028,0x1203);
}
void File::SetWriteToLibido()
return(newE);
}
+//-----------------------------------------------------------------------------
+// Private
+/**
+ * \brief Set the pixel datas in the good entry of the Header
+ */
+void File::SetPixelData(uint8_t* data)
+{
+ GetHeader()->SetEntryByNumber( GDCM_BINLOADED,
+ GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
+
+ // Will be 7fe0, 0010 in standard case
+ DocEntry* currentEntry = GetHeader()->GetDocEntryByNumber(GetHeader()->GetGrPixel(), GetHeader()->GetNumPixel());
+ if ( currentEntry )
+ {
+ if ( BinEntry* binEntry = dynamic_cast<BinEntry *>(currentEntry) )
+ // Flag is to false because datas are kept in the gdcmPixelConvert
+ binEntry->SetBinArea( data, false );
+ }
+}
+
//-----------------------------------------------------------------------------
} // end namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmFile.h,v $
Language: C++
- Date: $Date: 2004/11/24 16:39:18 $
- Version: $Revision: 1.75 $
+ Date: $Date: 2004/11/25 10:24:34 $
+ Version: $Revision: 1.76 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/// Accessor to \ref Header
Header* GetHeader() { return HeaderInternal; }
- /// Accessor to \ref ImageDataSize
size_t GetImageDataSize();
- /// Accessor to \ref ImageDataSizeRaw
- size_t GetImageDataSizeRaw();
+ size_t GetImageDataRawSize();
/// Accessor to \ref PixelConverter
PixelConvert* GetPixelConverter() { return PixelConverter; };
uint8_t* GetImageData();
- size_t GetImageDataIntoVector(void* destination, size_t maxSize);
uint8_t* GetImageDataRaw();
+ size_t GetImageDataIntoVector(void* destination, size_t maxSize);
// see also Header::SetImageDataSize ?!?
bool SetImageData (uint8_t* data, size_t expectedSize);
protected:
bool WriteBase(std::string const& fileName, FileType type);
+ bool CheckWriteIntegrity();
void SetWriteToNative();
void SetWriteToDecompressed();
private:
void Initialise();
- void SaveInitialValues(); // will belong to the future PixelData class
uint8_t* GetDecompressed();
int ComputeDecompressedPixelDataSizeFromHeader();
-private:
void SetPixelData(uint8_t* data);
+private:
+
// members variables:
/// Header to use to load the file
/// \brief to hold the Pixels (when read)
uint8_t* Pixel_Data; // (was PixelData)
- /// \brief Size (in bytes) of required memory to hold the Gray Level pixels
- /// represented in this file. This is used when the user DOESN'T want
- /// the RGB pixels image when it's stored as a PALETTE COLOR image
- size_t ImageDataSizeRaw;
-
/// \brief Size (in bytes) of requited memory to hold the the pixels
/// of this image in it's RGB convertion either from:
/// - Plane R, Plane G, Plane B
/// - YBR Pixels (or from RGB Pixels, as well)
size_t ImageDataSize;
- /// \brief ==1 if GetImageDataRaw was used
- /// ==0 if GetImageData was used
- /// ==-1 if ImageData never read
- int PixelRead;
-
//
// --------------- end of future PixelData class
-//
+//
};
} // end namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmPixelConvert.cxx,v $
Language: C++
- Date: $Date: 2004/11/24 10:23:47 $
- Version: $Revision: 1.32 $
+ Date: $Date: 2004/11/25 10:24:34 $
+ Version: $Revision: 1.33 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp )
{
- ComputeDecompressedAndRGBSizes();
- AllocateDecompressed();
+ // ComputeDecompressedAndRGBSizes is already made by
+ // ::GrabInformationsFromHeader. So, the structure sizes are
+ // correct
+ Squeeze();
+
//////////////////////////////////////////////////
//// First stage: get our hands on the Pixel Data.
if ( !fp )
return false;
}
+ AllocateDecompressed();
+
//////////////////////////////////////////////////
//// Second stage: read from disk dans decompress.
if ( BitsAllocated == 12 )
{
RGBSize = 3 * DecompressedSize;
}
-
+ else
+ {
+ RGBSize = DecompressedSize;
+ }
}
void PixelConvert::GrabInformationsFromHeader( Header* header )
{
dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: "
"unable to read red LUT data" );
- return;
}
}
{
dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: "
"unable to read green LUT data" );
- return;
}
}
{
dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: "
"unable to read blue LUT data" );
- return;
}
}
}
- if(fp) header->CloseFile();
+ ComputeDecompressedAndRGBSizes();
+
+ if(fp)
+ {
+ header->CloseFile();
+ }
}
/**
git://git.creatis.insa-lyon.fr / gdcm.git / commitdiff