Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2005/01/06 16:05:06 $
- Version: $Revision: 1.182 $
+ Date: $Date: 2005/01/06 20:03:27 $
+ Version: $Revision: 1.183 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
* @return Pointer to newly allocated pixel data.
* NULL if alloc fails
*/
-uint8_t* File::GetImageData()
+uint8_t *File::GetImageData()
{
if ( PixelWriteConverter->GetUserData() )
{
* @return Pointer to newly allocated pixel data.
* \ NULL if alloc fails
*/
-uint8_t* File::GetImageDataRaw ()
+uint8_t *File::GetImageDataRaw ()
{
return GetRaw();
}
* @return On success, the number of bytes actually copied. Zero on
* failure e.g. MaxSize is lower than necessary.
*/
-size_t File::GetImageDataIntoVector (void* destination, size_t maxSize)
+size_t File::GetImageDataIntoVector (void *destination, size_t maxSize)
{
if ( ! GetRaw() )
{
*
* @return boolean
*/
-void File::SetImageData(uint8_t* inData, size_t expectedSize)
+void File::SetImageData(uint8_t *inData, size_t expectedSize)
{
SetUserData(inData,expectedSize);
}
* \brief Set the image datas defined by the user
* \warning When writting the file, this datas are get as default datas to write
*/
-void File::SetUserData(uint8_t* data, size_t expectedSize)
+void File::SetUserData(uint8_t *data, size_t expectedSize)
{
PixelWriteConverter->SetUserData(data,expectedSize);
}
/**
* \brief Get the image datas defined by the user
- * \warning When writting the file, this datas are get as default datas to write
+ * \warning When writting the file, this datas are get as default data to write
*/
-uint8_t* File::GetUserData()
+uint8_t *File::GetUserData()
{
return PixelWriteConverter->GetUserData();
}
/**
* \brief Get the image data size defined by the user
- * \warning When writting the file, this datas are get as default datas to write
+ * \warning When writting the file, this datas are get as default data to write
*/
size_t File::GetUserDataSize()
{
/**
* \brief Get the image datas from the file.
- * If a LUT is found, the datas are expanded to be RGB
+ * If a LUT is found, the data are expanded to be RGB
*/
-uint8_t* File::GetRGBData()
+uint8_t *File::GetRGBData()
{
return PixelReadConverter->GetRGB();
}
/**
* \brief Get the image data size from the file.
- * If a LUT is found, the datas are expanded to be RGB
+ * If a LUT is found, the data are expanded to be RGB
*/
size_t File::GetRGBDataSize()
{
* \brief Get the image datas from the file.
* If a LUT is found, the datas are not expanded !
*/
-uint8_t* File::GetRawData()
+uint8_t *File::GetRawData()
{
return PixelReadConverter->GetRaw();
}
/**
* \brief Get the image data size from the file.
- * If a LUT is found, the datas are not expanded !
+ * If a LUT is found, the data are not expanded !
*/
size_t File::GetRawDataSize()
{
* @return false if write fails
*/
-bool File::WriteRawData(std::string const & fileName)
+bool File::WriteRawData(std::string const &fileName)
{
std::ofstream fp1(fileName.c_str(), std::ios::out | std::ios::binary );
if (!fp1)
* @return false if write fails
*/
-bool File::WriteDcmImplVR (std::string const & fileName)
+bool File::WriteDcmImplVR (std::string const &fileName)
{
SetWriteTypeToDcmImplVR();
return Write(fileName);
* @return false if write fails
*/
-bool File::WriteDcmExplVR (std::string const & fileName)
+bool File::WriteDcmExplVR (std::string const &fileName)
{
SetWriteTypeToDcmExplVR();
return Write(fileName);
* @return false if write fails
*/
-bool File::WriteAcr (std::string const & fileName)
+bool File::WriteAcr (std::string const &fileName)
{
SetWriteTypeToAcr();
return Write(fileName);
* (any already existing file is overwritten)
* @return false if write fails
*/
-bool File::Write(std::string const& fileName)
+bool File::Write(std::string const &fileName)
{
switch(WriteType)
{
* @param group group number of the Dicom Element to modify
* @param element element number of the Dicom Element to modify
*/
-bool File::SetEntryByNumber(std::string const& content,
+bool File::SetEntryByNumber(std::string const &content,
uint16_t group, uint16_t element)
{
return HeaderInternal->SetEntryByNumber(content,group,element);
* @param group group number of the Dicom Element to modify
* @param element element number of the Dicom Element to modify
*/
-bool File::SetEntryByNumber(uint8_t* content, int lgth,
+bool File::SetEntryByNumber(uint8_t *content, int lgth,
uint16_t group, uint16_t element)
{
return HeaderInternal->SetEntryByNumber(content,lgth,group,element);
* \return pointer to the modified/created Header Entry (NULL when creation
* failed).
*/
-bool File::ReplaceOrCreateByNumber(std::string const& content,
+bool File::ReplaceOrCreateByNumber(std::string const &content,
uint16_t group, uint16_t element)
{
return HeaderInternal->ReplaceOrCreateByNumber(content,group,element) != NULL;
* \return pointer to the modified/created Header Entry (NULL when creation
* failed).
*/
-bool File::ReplaceOrCreateByNumber(uint8_t* binArea, int lgth,
+bool File::ReplaceOrCreateByNumber(uint8_t *binArea, int lgth,
uint16_t group, uint16_t element)
{
return HeaderInternal->ReplaceOrCreateByNumber(binArea,lgth,group,element) != NULL;
}
else
{
- ValEntry* photInt = CopyValEntry(0x0028,0x0004);
+ ValEntry *photInt = CopyValEntry(0x0028,0x0004);
if(HeaderInternal->HasLUT())
{
photInt->SetValue("PALETTE COLOR ");
PixelWriteConverter->SetReadData(PixelReadConverter->GetRaw(),
PixelReadConverter->GetRawSize());
- BinEntry* pixel = CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel());
+ BinEntry *pixel = CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel());
pixel->SetValue(GDCM_BINLOADED);
pixel->SetBinArea(PixelWriteConverter->GetData(),false);
pixel->SetLength(PixelWriteConverter->GetDataSize());
{
PixelReadConverter->BuildRGBImage();
- ValEntry* spp = CopyValEntry(0x0028,0x0002);
+ ValEntry *spp = CopyValEntry(0x0028,0x0002);
spp->SetValue("3 ");
- ValEntry* planConfig = CopyValEntry(0x0028,0x0006);
+ ValEntry *planConfig = CopyValEntry(0x0028,0x0006);
planConfig->SetValue("0 ");
- ValEntry* photInt = CopyValEntry(0x0028,0x0004);
+ ValEntry *photInt = CopyValEntry(0x0028,0x0004);
photInt->SetValue("RGB ");
if(PixelReadConverter->GetRGB())
PixelReadConverter->GetRawSize());
}
- BinEntry* pixel = CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel());
+ BinEntry *pixel = CopyBinEntry(GetHeader()->GetGrPixel(),GetHeader()->GetNumPixel());
pixel->SetValue(GDCM_BINLOADED);
pixel->SetBinArea(PixelWriteConverter->GetData(),false);
pixel->SetLength(PixelWriteConverter->GetDataSize());
// samples per pixels = 1 (in the read file)
if(HeaderInternal->GetBitsAllocated()==24)
{
- ValEntry* bitsAlloc = CopyValEntry(0x0028,0x0100);
+ ValEntry *bitsAlloc = CopyValEntry(0x0028,0x0100);
bitsAlloc->SetValue("8 ");
- ValEntry* bitsStored = CopyValEntry(0x0028,0x0101);
+ ValEntry *bitsStored = CopyValEntry(0x0028,0x0101);
bitsStored->SetValue("8 ");
- ValEntry* highBit = CopyValEntry(0x0028,0x0102);
+ ValEntry *highBit = CopyValEntry(0x0028,0x0102);
highBit->SetValue("7 ");
Archive->Push(bitsAlloc);
std::string ts = Util::DicomString(
Document::GetTransferSyntaxValue(ExplicitVRLittleEndian).c_str() );
- ValEntry* tss = CopyValEntry(0x0002,0x0010);
+ ValEntry *tss = CopyValEntry(0x0002,0x0010);
tss->SetValue(ts);
Archive->Push(tss);
std::string ts = Util::DicomString(
Document::GetTransferSyntaxValue(ImplicitVRLittleEndian).c_str() );
- ValEntry* tss = CopyValEntry(0x0002,0x0010);
+ ValEntry *tss = CopyValEntry(0x0002,0x0010);
tss->SetValue(ts);
Archive->Push(tss);
Archive->Restore(0x0008,0x0010);
}
-ValEntry* File::CopyValEntry(uint16_t group,uint16_t element)
+ValEntry *File::CopyValEntry(uint16_t group,uint16_t element)
{
- DocEntry* oldE = HeaderInternal->GetDocEntryByNumber(group, element);
- ValEntry* newE;
+ DocEntry *oldE = HeaderInternal->GetDocEntryByNumber(group, element);
+ ValEntry *newE;
if(oldE)
{
return(newE);
}
-BinEntry* File::CopyBinEntry(uint16_t group,uint16_t element)
+BinEntry *File::CopyBinEntry(uint16_t group,uint16_t element)
{
- DocEntry* oldE = HeaderInternal->GetDocEntryByNumber(group, element);
- BinEntry* newE;
+ DocEntry *oldE = HeaderInternal->GetDocEntryByNumber(group, element);
+ BinEntry *newE;
if(oldE)
{
}
}
-uint8_t* File::GetRaw()
+uint8_t *File::GetRaw()
{
- uint8_t* raw = PixelReadConverter->GetRaw();
+ uint8_t *raw = PixelReadConverter->GetRaw();
if ( ! raw )
{
// The Raw image migth not be loaded yet:
- std::ifstream* fp = HeaderInternal->OpenFile();
+ std::ifstream *fp = HeaderInternal->OpenFile();
PixelReadConverter->ReadAndDecompressPixelData( fp );
if(fp)
HeaderInternal->CloseFile();
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff