From: regrain Date: Fri, 3 Dec 2004 10:21:53 +0000 (+0000) Subject: * Rename src/gdcmPixelConvert.[h|cxx] to src/gdcmPixelReadConvert.[h|cxx] X-Git-Tag: Version1.0.bp~547 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2bb60efea83f2bfa1823f27b2a5536a0e6cfd8c0;p=gdcm.git * Rename src/gdcmPixelConvert.[h|cxx] to src/gdcmPixelReadConvert.[h|cxx] -- BeNours --- diff --git a/ChangeLog b/ChangeLog index 40cddfe9..5bb70d02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2004-12-03 Benoit Regrain + * Rename src/gdcmPixelConvert.[h|cxx] to src/gdcmPixelReadConvert.[h|cxx] + 2004-12-02 Benoit Regrain * vtk/vtkGdcmReader.cxx : correct error in vtkDebugMacro, vtkWarningMacro and vtkErrorMacro use. diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx index 7cc42f70..aae83a4c 100644 --- a/Example/PrintFile.cxx +++ b/Example/PrintFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PrintFile.cxx,v $ Language: C++ - Date: $Date: 2004/11/25 10:24:33 $ - Version: $Revision: 1.14 $ + Date: $Date: 2004/12/03 10:21:53 $ + Version: $Revision: 1.15 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -94,7 +94,7 @@ int main(int argc, char* argv[]) { std::cout << std::endl << "===========================================" << std::endl; - f1->GetPixelConverter()->Print(); + f1->GetPixelReadConverter()->Print(); std::cout << std::endl << "===========================================" << std::endl; } diff --git a/Example/PrintHeader.cxx b/Example/PrintHeader.cxx index 516048e5..04a1c291 100644 --- a/Example/PrintHeader.cxx +++ b/Example/PrintHeader.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: PrintHeader.cxx,v $ Language: C++ - Date: $Date: 2004/11/25 10:24:33 $ - Version: $Revision: 1.10 $ + Date: $Date: 2004/12/03 10:21:53 $ + Version: $Revision: 1.11 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -37,8 +37,7 @@ int main(int argc, char* argv[]) fileName += "/test.acr"; } - gdcm::File *f1 = new gdcm::File( fileName.c_str() ); - gdcm::Header *e1 = f1->GetHeader(); + gdcm::Header *e1 = new gdcm::Header( fileName.c_str() ); if (argc > 2) { @@ -61,19 +60,6 @@ int main(int argc, char* argv[]) 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; - f1->GetPixelConverter()->Print(); - std::cout << std::endl << "===========================================" - << std::endl; - } - if(e1->IsReadable()) std::cout <GetPixelConverter()->Print(); + f1->GetPixelReadConverter()->Print(); std::cout << std::endl << "===========================================" << std::endl; } diff --git a/Example/Write.cxx b/Example/Write.cxx index b9632bda..6e2f1e3e 100644 --- a/Example/Write.cxx +++ b/Example/Write.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: Write.cxx,v $ Language: C++ - Date: $Date: 2004/11/16 04:26:18 $ - Version: $Revision: 1.9 $ + Date: $Date: 2004/12/03 10:21:53 $ + 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 @@ -104,7 +104,7 @@ int main(int argc, char* argv[]) && transferSyntaxName != "Uncompressed ACR-NEMA" ) { std::cout << std::endl << "===========================================" << std::endl; - f1->GetPixelConverter()->Print(); + f1->GetPixelReadConverter()->Print(); std::cout << std::endl << "===========================================" << std::endl; } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 999a933e..541ba160 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,7 +42,7 @@ SET(libgdcm_la_SOURCES gdcmJpeg12.cxx gdcmJpeg16.cxx gdcmJpeg2000.cxx - gdcmPixelConvert.cxx + gdcmPixelReadConvert.cxx gdcmRLEFrame.cxx gdcmRLEFramesInfo.cxx gdcmSeqEntry.cxx diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx index 035e25c3..6d596da7 100644 --- a/src/gdcmFile.cxx +++ b/src/gdcmFile.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.cxx,v $ Language: C++ - Date: $Date: 2004/11/30 14:17:52 $ - Version: $Revision: 1.167 $ + Date: $Date: 2004/12/03 10:21:54 $ + Version: $Revision: 1.168 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -79,12 +79,12 @@ void File::Initialise() WriteMode = WMODE_DECOMPRESSED; WriteType = WTYPE_IMPL_VR; - PixelConverter = new PixelConvert; + PixelReadConverter = new PixelReadConvert; Archive = new DocEntryArchive( HeaderInternal ); if ( HeaderInternal->IsReadable() ) { - PixelConverter->GrabInformationsFromHeader( HeaderInternal ); + PixelReadConverter->GrabInformationsFromHeader( HeaderInternal ); } Pixel_Data = 0; @@ -98,9 +98,9 @@ void File::Initialise() */ File::~File() { - if( PixelConverter ) + if( PixelReadConverter ) { - delete PixelConverter; + delete PixelReadConverter; } if( Archive ) { @@ -128,7 +128,7 @@ File::~File() */ size_t File::GetImageDataSize() { - return PixelConverter->GetRGBSize(); + return PixelReadConverter->GetRGBSize(); } /** @@ -140,7 +140,7 @@ size_t File::GetImageDataSize() */ size_t File::GetImageDataRawSize() { - return PixelConverter->GetDecompressedSize(); + return PixelReadConverter->GetDecompressedSize(); } /** @@ -161,14 +161,14 @@ uint8_t* File::GetImageData() return 0; } - if ( HeaderInternal->HasLUT() && PixelConverter->BuildRGBImage() ) + if ( HeaderInternal->HasLUT() && PixelReadConverter->BuildRGBImage() ) { - return PixelConverter->GetRGB(); + return PixelReadConverter->GetRGB(); } else { // When no LUT or LUT conversion fails, return the decompressed - return PixelConverter->GetDecompressed(); + return PixelReadConverter->GetDecompressed(); } } @@ -205,31 +205,31 @@ size_t File::GetImageDataIntoVector (void* destination, size_t maxSize) return 0; } - if ( HeaderInternal->HasLUT() && PixelConverter->BuildRGBImage() ) + if ( HeaderInternal->HasLUT() && PixelReadConverter->BuildRGBImage() ) { - if ( PixelConverter->GetRGBSize() > maxSize ) + if ( PixelReadConverter->GetRGBSize() > maxSize ) { dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger" "than caller's expected MaxSize"); return 0; } memcpy( destination, - (void*)PixelConverter->GetRGB(), - PixelConverter->GetRGBSize() ); - return PixelConverter->GetRGBSize(); + (void*)PixelReadConverter->GetRGB(), + PixelReadConverter->GetRGBSize() ); + return PixelReadConverter->GetRGBSize(); } // Either no LUT conversion necessary or LUT conversion failed - if ( PixelConverter->GetDecompressedSize() > maxSize ) + if ( PixelReadConverter->GetDecompressedSize() > maxSize ) { dbg.Verbose(0, "File::GetImageDataIntoVector: pixel data bigger" "than caller's expected MaxSize"); return 0; } memcpy( destination, - (void*)PixelConverter->GetDecompressed(), - PixelConverter->GetDecompressedSize() ); - return PixelConverter->GetDecompressedSize(); + (void*)PixelReadConverter->GetDecompressed(), + PixelReadConverter->GetDecompressedSize() ); + return PixelReadConverter->GetDecompressedSize(); } /** @@ -248,16 +248,16 @@ uint8_t* File::GetImageDataRaw () uint8_t* File::GetDecompressed() { - uint8_t* decompressed = PixelConverter->GetDecompressed(); + uint8_t* decompressed = PixelReadConverter->GetDecompressed(); if ( ! decompressed ) { // The decompressed image migth not be loaded yet: std::ifstream* fp = HeaderInternal->OpenFile(); - PixelConverter->ReadAndDecompressPixelData( fp ); + PixelReadConverter->ReadAndDecompressPixelData( fp ); if(fp) HeaderInternal->CloseFile(); - decompressed = PixelConverter->GetDecompressed(); + decompressed = PixelReadConverter->GetDecompressed(); if ( ! decompressed ) { dbg.Verbose(0, "File::GetDecompressed: read/decompress of " @@ -378,11 +378,11 @@ bool File::Write(std::string const& fileName) } /** - * \brief Access to the underlying \ref PixelConverter RGBA LUT + * \brief Access to the underlying \ref PixelReadConverter RGBA LUT */ uint8_t* File::GetLutRGBA() { - return PixelConverter->GetLutRGBA(); + return PixelReadConverter->GetLutRGBA(); } //----------------------------------------------------------------------------- @@ -413,6 +413,14 @@ bool File::WriteBase (std::string const & fileName, FileType type) SetWriteFileTypeToExplicitVR(); } + // -------------------------------------------------------------- + // Special Patch to allow gdcm to re-write ACR-LibIDO formated images + // + // if recognition code tells us we dealt with a LibIDO image + // we reproduce on disk the switch between lineNumber and columnNumber + // just before writting ... + /// \todo the best trick would be *change* the recognition code + /// but pb expected if user deals with, e.g. COMPLEX images if( type == ACR_LIBIDO ) { SetWriteToLibido(); @@ -421,12 +429,10 @@ bool File::WriteBase (std::string const & fileName, FileType type) { SetWriteToNoLibido(); } + // ----------------- End of Special Patch ---------------- switch(WriteMode) { - case WMODE_NATIVE : - SetWriteToNative(); - break; case WMODE_DECOMPRESSED : SetWriteToDecompressed(); break; @@ -435,40 +441,22 @@ bool File::WriteBase (std::string const & fileName, FileType type) break; } - // -------------------------------------------------------------- - // Special Patch to allow gdcm to re-write ACR-LibIDO formated images - // - // if recognition code tells us we dealt with a LibIDO image - // we reproduce on disk the switch between lineNumber and columnNumber - // just before writting ... - /// \todo the best trick would be *change* the recognition code - /// but pb expected if user deals with, e.g. COMPLEX images -/* if ( HeaderInternal->GetFileType() == ACR_LIBIDO) - { - SetWriteToLibido(); - }*/ - // ----------------- End of Special Patch ---------------- - bool check = CheckWriteIntegrity(); if(check) { check = HeaderInternal->Write(fileName,type); } + RestoreWrite(); + RestoreWriteFileType(); + // -------------------------------------------------------------- // Special Patch to allow gdcm to re-write ACR-LibIDO formated images // // ...and we restore the Header to be Dicom Compliant again // just after writting -/* if ( HeaderInternal->GetFileType() == ACR_LIBIDO ) - { - RestoreWriteFromLibido(); - }*/ - // ----------------- End of Special Patch ---------------- - - RestoreWrite(); - RestoreWriteFileType(); RestoreWriteOfLibido(); + // ----------------- End of Special Patch ---------------- return check; } @@ -502,8 +490,6 @@ bool File::CheckWriteIntegrity() switch(WriteMode) { - case WMODE_NATIVE : - break; case WMODE_DECOMPRESSED : if( decSize!=ImageDataSize ) { @@ -526,7 +512,7 @@ bool File::CheckWriteIntegrity() return true; } -void File::SetWriteToNative() +/*void File::SetWriteToNative() { if(Pixel_Data) { @@ -537,7 +523,7 @@ void File::SetWriteToNative() Archive->Push(pixel); } -} +}*/ void File::SetWriteToDecompressed() { @@ -568,8 +554,8 @@ void File::SetWriteToDecompressed() } else { - pixel->SetBinArea(PixelConverter->GetDecompressed(),false); - pixel->SetLength(PixelConverter->GetDecompressedSize()); + pixel->SetBinArea(PixelReadConverter->GetDecompressed(),false); + pixel->SetLength(PixelReadConverter->GetDecompressedSize()); } Archive->Push(photInt); @@ -581,7 +567,7 @@ void File::SetWriteToRGB() { if(HeaderInternal->GetNumberOfScalarComponents()==3) { - PixelConverter->BuildRGBImage(); + PixelReadConverter->BuildRGBImage(); ValEntry* spp = CopyValEntry(0x0028,0x0002); spp->SetValue("3 "); @@ -602,15 +588,15 @@ void File::SetWriteToRGB() pixel->SetBinArea(Pixel_Data,false); pixel->SetLength(ImageDataSize); } - else if(PixelConverter->GetRGB()) + else if(PixelReadConverter->GetRGB()) { - pixel->SetBinArea(PixelConverter->GetRGB(),false); - pixel->SetLength(PixelConverter->GetRGBSize()); + pixel->SetBinArea(PixelReadConverter->GetRGB(),false); + pixel->SetLength(PixelReadConverter->GetRGBSize()); } else // Decompressed data { - pixel->SetBinArea(PixelConverter->GetDecompressed(),false); - pixel->SetLength(PixelConverter->GetDecompressedSize()); + pixel->SetBinArea(PixelReadConverter->GetDecompressed(),false); + pixel->SetLength(PixelReadConverter->GetDecompressedSize()); } Archive->Push(spp); @@ -790,7 +776,6 @@ BinEntry* File::CopyBinEntry(uint16_t group,uint16_t element) newE = GetHeader()->NewBinEntryByNumber(group,element); } - return(newE); } diff --git a/src/gdcmFile.h b/src/gdcmFile.h index 53062b89..01b638c4 100644 --- a/src/gdcmFile.h +++ b/src/gdcmFile.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFile.h,v $ Language: C++ - Date: $Date: 2004/11/30 14:17:52 $ - Version: $Revision: 1.79 $ + Date: $Date: 2004/12/03 10:21:54 $ + Version: $Revision: 1.80 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,7 +21,7 @@ #include "gdcmCommon.h" #include "gdcmHeader.h" -#include "gdcmPixelConvert.h" +#include "gdcmPixelReadConvert.h" #include "gdcmDocEntryArchive.h" namespace gdcm @@ -37,7 +37,6 @@ class GDCM_EXPORT File public: enum TWriteMode { - WMODE_NATIVE, WMODE_DECOMPRESSED, WMODE_RGB }; @@ -61,8 +60,8 @@ public: size_t GetImageDataSize(); size_t GetImageDataRawSize(); - /// Accessor to \ref PixelConverter - PixelConvert* GetPixelConverter() { return PixelConverter; }; + /// Accessor to \ref PixelReadConverter + PixelReadConvert* GetPixelReadConverter() { return PixelReadConverter; }; uint8_t* GetImageData(); uint8_t* GetImageDataRaw(); @@ -88,7 +87,6 @@ public: uint8_t* GetLutRGBA(); // Write mode - void SetWriteModeToNative() { SetWriteMode(WMODE_NATIVE); }; void SetWriteModeToDecompressed() { SetWriteMode(WMODE_DECOMPRESSED); }; void SetWriteModeToRGB() { SetWriteMode(WMODE_RGB); }; void SetWriteMode(unsigned int mode) { WriteMode = mode; }; @@ -105,7 +103,6 @@ protected: bool WriteBase(std::string const& fileName, FileType type); bool CheckWriteIntegrity(); - void SetWriteToNative(); void SetWriteToDecompressed(); void SetWriteToRGB(); void RestoreWrite(); @@ -143,7 +140,7 @@ private: bool Parsed; /// Utility pixel converter - PixelConvert* PixelConverter; + PixelReadConvert* PixelReadConverter; // Utility header archive DocEntryArchive *Archive; diff --git a/src/gdcmJPEGFragment.h b/src/gdcmJPEGFragment.h index bc9bfb36..203cd2e6 100644 --- a/src/gdcmJPEGFragment.h +++ b/src/gdcmJPEGFragment.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJPEGFragment.h,v $ Language: C++ - Date: $Date: 2004/10/20 14:30:40 $ - Version: $Revision: 1.4 $ + Date: $Date: 2004/12/03 10:21:54 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -41,7 +41,7 @@ class GDCM_EXPORT JPEGFragment { friend class Document; friend class File; -friend class PixelConvert; +friend class PixelReadConvert; long Offset; long Length; public: diff --git a/src/gdcmJPEGFragmentsInfo.h b/src/gdcmJPEGFragmentsInfo.h index 0ae0ac8d..6b1115ca 100644 --- a/src/gdcmJPEGFragmentsInfo.h +++ b/src/gdcmJPEGFragmentsInfo.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJPEGFragmentsInfo.h,v $ Language: C++ - Date: $Date: 2004/10/20 14:30:40 $ - Version: $Revision: 1.5 $ + Date: $Date: 2004/12/03 10:21:54 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -42,7 +42,7 @@ class GDCM_EXPORT JPEGFragmentsInfo { friend class Document; friend class File; -friend class PixelConvert; +friend class PixelReadConvert; private: typedef std::list< JPEGFragment* > JPEGFragmentsList; JPEGFragmentsList Fragments; diff --git a/src/gdcmPixelConvert.cxx b/src/gdcmPixelReadConvert.cxx similarity index 90% rename from src/gdcmPixelConvert.cxx rename to src/gdcmPixelReadConvert.cxx index 28653c12..d4c57abf 100644 --- a/src/gdcmPixelConvert.cxx +++ b/src/gdcmPixelReadConvert.cxx @@ -1,10 +1,10 @@ /*========================================================================= Program: gdcm - Module: $RCSfile: gdcmPixelConvert.cxx,v $ + Module: $RCSfile: gdcmPixelReadConvert.cxx,v $ Language: C++ - Date: $Date: 2004/11/30 16:59:32 $ - Version: $Revision: 1.34 $ + Date: $Date: 2004/12/03 10:21:55 $ + Version: $Revision: 1.1 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -20,10 +20,10 @@ // look for "fixMem" and convert that to a member of this class // Removing the prefix fixMem and dealing with allocations should do the trick // -// grep PIXELCONVERT everywhere and clean up ! +// grep PixelReadConvert everywhere and clean up ! #include "gdcmDebug.h" -#include "gdcmPixelConvert.h" +#include "gdcmPixelReadConvert.h" #include #include @@ -48,7 +48,7 @@ bool gdcm_read_JPEG_file16 (std::ifstream* fp, void* image_buffer); //----------------------------------------------------------------------------- // Constructor / Destructor -PixelConvert::PixelConvert() +PixelReadConvert::PixelReadConvert() { RGB = 0; RGBSize = 0; @@ -60,7 +60,7 @@ PixelConvert::PixelConvert() LutBlueData =0; } -void PixelConvert::Squeeze() +void PixelReadConvert::Squeeze() { if ( RGB ) { @@ -81,12 +81,12 @@ void PixelConvert::Squeeze() LutRGBA = 0; } -PixelConvert::~PixelConvert() +PixelReadConvert::~PixelReadConvert() { Squeeze(); } -void PixelConvert::AllocateRGB() +void PixelReadConvert::AllocateRGB() { if ( RGB ) { delete [] RGB; @@ -94,7 +94,7 @@ void PixelConvert::AllocateRGB() RGB = new uint8_t[ RGBSize ]; } -void PixelConvert::AllocateDecompressed() +void PixelReadConvert::AllocateDecompressed() { if ( Decompressed ) { delete [] Decompressed; @@ -106,7 +106,7 @@ void PixelConvert::AllocateDecompressed() * \brief Read from file a 12 bits per pixel image and decompress it * into a 16 bits per pixel image. */ -void PixelConvert::ReadAndDecompress12BitsTo16Bits( std::ifstream* fp ) +void PixelReadConvert::ReadAndDecompress12BitsTo16Bits( std::ifstream* fp ) throw ( FormatError ) { int nbPixels = XSize * YSize; @@ -119,21 +119,21 @@ void PixelConvert::ReadAndDecompress12BitsTo16Bits( std::ifstream* fp ) fp->read( (char*)&b0, 1); if ( fp->fail() || fp->eof() )//Fp->gcount() == 1 { - throw FormatError( "PixelConvert::ReadAndDecompress12BitsTo16Bits()", + throw FormatError( "PixelReadConvert::ReadAndDecompress12BitsTo16Bits()", "Unfound first block" ); } fp->read( (char*)&b1, 1 ); if ( fp->fail() || fp->eof())//Fp->gcount() == 1 { - throw FormatError( "PixelConvert::ReadAndDecompress12BitsTo16Bits()", + throw FormatError( "PixelReadConvert::ReadAndDecompress12BitsTo16Bits()", "Unfound second block" ); } fp->read( (char*)&b2, 1 ); if ( fp->fail() || fp->eof())//Fp->gcount() == 1 { - throw FormatError( "PixelConvert::ReadAndDecompress12BitsTo16Bits()", + throw FormatError( "PixelReadConvert::ReadAndDecompress12BitsTo16Bits()", "Unfound second block" ); } @@ -158,7 +158,7 @@ void PixelConvert::ReadAndDecompress12BitsTo16Bits( std::ifstream* fp ) * High Byte 'Planes'...(for what it may mean) * @return Boolean */ -bool PixelConvert::DecompressRLE16BitsFromRLE8Bits( int NumberOfFrames ) +bool PixelReadConvert::DecompressRLE16BitsFromRLE8Bits( int NumberOfFrames ) { size_t PixelNumber = XSize * YSize; size_t decompressedSize = XSize * YSize * NumberOfFrames; @@ -201,7 +201,7 @@ bool PixelConvert::DecompressRLE16BitsFromRLE8Bits( int NumberOfFrames ) * @param fp File Pointer: on entry the position should be the one of * the fragment to be decoded. */ -bool PixelConvert::ReadAndDecompressRLEFragment( uint8_t* subDecompressed, +bool PixelReadConvert::ReadAndDecompressRLEFragment( uint8_t* subDecompressed, long fragmentSize, long decompressedSegmentSize, std::ifstream* fp ) @@ -244,7 +244,7 @@ bool PixelConvert::ReadAndDecompressRLEFragment( uint8_t* subDecompressed, if ( numberOfReadBytes > fragmentSize ) { - dbg.Verbose(0, "PixelConvert::ReadAndDecompressRLEFragment: we " + dbg.Verbose(0, "PixelReadConvert::ReadAndDecompressRLEFragment: we " "read more bytes than the segment size."); return false; } @@ -259,7 +259,7 @@ bool PixelConvert::ReadAndDecompressRLEFragment( uint8_t* subDecompressed, * at which the pixel data should be copied * @return Boolean */ -bool PixelConvert::ReadAndDecompressRLEFile( std::ifstream* fp ) +bool PixelReadConvert::ReadAndDecompressRLEFile( std::ifstream* fp ) { uint8_t* subDecompressed = Decompressed; long decompressedSegmentSize = XSize * YSize; @@ -294,7 +294,7 @@ bool PixelConvert::ReadAndDecompressRLEFile( std::ifstream* fp ) /** * \brief Swap the bytes, according to \ref SwapCode. */ -void PixelConvert::ConvertSwapZone() +void PixelReadConvert::ConvertSwapZone() { unsigned int i; @@ -317,7 +317,7 @@ void PixelConvert::ConvertSwapZone() } break; default: - dbg.Verbose( 0, "PixelConvert::ConvertSwapZone: SwapCode value " + dbg.Verbose( 0, "PixelReadConvert::ConvertSwapZone: SwapCode value " "(16 bits) not allowed." ); } } @@ -364,7 +364,7 @@ void PixelConvert::ConvertSwapZone() } break; default: - dbg.Verbose( 0, "PixelConvert::ConvertSwapZone: SwapCode value " + dbg.Verbose( 0, "PixelReadConvert::ConvertSwapZone: SwapCode value " "(32 bits) not allowed." ); } } @@ -373,7 +373,7 @@ void PixelConvert::ConvertSwapZone() /** * \brief Deal with endianity i.e. re-arange bytes inside the integer */ -void PixelConvert::ConvertReorderEndianity() +void PixelReadConvert::ConvertReorderEndianity() { if ( BitsAllocated != 8 ) { @@ -404,7 +404,7 @@ void PixelConvert::ConvertReorderEndianity() * @param fp File Pointer * @return Boolean */ -bool PixelConvert::ReadAndDecompressJPEGFile( std::ifstream* fp ) +bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream* fp ) { uint8_t* localDecompressed = Decompressed; // Loop on the fragment[s] @@ -450,7 +450,7 @@ bool PixelConvert::ReadAndDecompressJPEGFile( std::ifstream* fp ) else { // other JPEG lossy not supported - dbg.Error("PixelConvert::ReadAndDecompressJPEGFile: unknown " + dbg.Error("PixelReadConvert::ReadAndDecompressJPEGFile: unknown " "jpeg lossy compression "); return false; } @@ -469,7 +469,7 @@ bool PixelConvert::ReadAndDecompressJPEGFile( std::ifstream* fp ) * \brief Re-arrange the bits within the bytes. * @return Boolean */ -bool PixelConvert::ConvertReArrangeBits() throw ( FormatError ) +bool PixelReadConvert::ConvertReArrangeBits() throw ( FormatError ) { if ( BitsStored != BitsAllocated ) { @@ -498,8 +498,8 @@ bool PixelConvert::ConvertReArrangeBits() throw ( FormatError ) } else { - dbg.Verbose(0, "PixelConvert::ConvertReArrangeBits: weird image"); - throw FormatError( "PixelConvert::ConvertReArrangeBits()", + dbg.Verbose(0, "PixelReadConvert::ConvertReArrangeBits: weird image"); + throw FormatError( "PixelReadConvert::ConvertReArrangeBits()", "weird image !?" ); } } @@ -510,7 +510,7 @@ bool PixelConvert::ConvertReArrangeBits() throw ( FormatError ) * \brief Convert (Y plane, cB plane, cR plane) to RGB pixels * \warning Works on all the frames at a time */ -void PixelConvert::ConvertYcBcRPlanesToRGBPixels() +void PixelReadConvert::ConvertYcBcRPlanesToRGBPixels() { uint8_t* localDecompressed = Decompressed; uint8_t* copyDecompressed = new uint8_t[ DecompressedSize ]; @@ -564,7 +564,7 @@ void PixelConvert::ConvertYcBcRPlanesToRGBPixels() * \brief Convert (Red plane, Green plane, Blue plane) to RGB pixels * \warning Works on all the frames at a time */ -void PixelConvert::ConvertRGBPlanesToRGBPixels() +void PixelReadConvert::ConvertRGBPlanesToRGBPixels() { uint8_t* localDecompressed = Decompressed; uint8_t* copyDecompressed = new uint8_t[ DecompressedSize ]; @@ -585,7 +585,7 @@ void PixelConvert::ConvertRGBPlanesToRGBPixels() delete[] copyDecompressed; } -bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp ) +bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream* fp ) { // ComputeDecompressedAndRGBSizes is already made by // ::GrabInformationsFromHeader. So, the structure sizes are @@ -596,7 +596,7 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp ) //// First stage: get our hands on the Pixel Data. if ( !fp ) { - dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " + dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " "unavailable file pointer." ); return false; } @@ -604,7 +604,7 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp ) fp->seekg( PixelOffset, std::ios::beg ); if( fp->fail() || fp->eof()) //Fp->gcount() == 1 { - dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " + dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " "unable to find PixelOffset in file." ); return false; } @@ -625,8 +625,8 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp ) // variable). But DecompressedSize is the right size of the image ! if( PixelDataLength != DecompressedSize) { - dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " - "Mismatch between PixelConvert and DecompressedSize." ); + dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " + "Mismatch between PixelReadConvert and DecompressedSize." ); } if( PixelDataLength > DecompressedSize) { @@ -639,7 +639,7 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp ) if ( fp->fail() || fp->eof())//Fp->gcount() == 1 { - dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " + dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " "reading of decompressed pixel data failed." ); return false; } @@ -648,7 +648,7 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp ) { if ( ! ReadAndDecompressRLEFile( fp ) ) { - dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " + dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " "RLE decompressor failed." ); return false; } @@ -658,7 +658,7 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp ) // Default case concerns JPEG family if ( ! ReadAndDecompressJPEGFile( fp ) ) { - dbg.Verbose( 0, "PixelConvert::ReadAndDecompressPixelData: " + dbg.Verbose( 0, "PixelReadConvert::ReadAndDecompressPixelData: " "JPEG decompressor failed." ); return false; } @@ -673,7 +673,7 @@ bool PixelConvert::ReadAndDecompressPixelData( std::ifstream* fp ) return true; } -void PixelConvert::ConvertHandleColor() +void PixelReadConvert::ConvertHandleColor() { ////////////////////////////////// // Deal with the color decoding i.e. handle: @@ -747,7 +747,7 @@ void PixelConvert::ConvertHandleColor() * \brief Predicate to know wether the image[s] (once decompressed) is RGB. * \note See comments of \ref ConvertHandleColor */ -bool PixelConvert::IsDecompressedRGB() +bool PixelReadConvert::IsDecompressedRGB() { if ( IsMonochrome || PlanarConfiguration == 2 @@ -758,7 +758,7 @@ bool PixelConvert::IsDecompressedRGB() return true; } -void PixelConvert::ComputeDecompressedAndRGBSizes() +void PixelReadConvert::ComputeDecompressedAndRGBSizes() { int bitsAllocated = BitsAllocated; // Number of "Bits Allocated" is fixed to 16 when it's 12, since @@ -782,7 +782,7 @@ void PixelConvert::ComputeDecompressedAndRGBSizes() } } -void PixelConvert::GrabInformationsFromHeader( Header* header ) +void PixelReadConvert::GrabInformationsFromHeader( Header* header ) { // Just in case some access to a Header element requires disk access. // Note: gdcmDocument::Fp is leaved open after OpenFile. @@ -873,7 +873,7 @@ void PixelConvert::GrabInformationsFromHeader( Header* header ) fp->read( (char*)LutRedData, (size_t)lutRedDataEntry->GetLength()); if ( fp->fail() || fp->eof())//Fp->gcount() == 1 { - dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: " + dbg.Verbose(0, "PixelReadConvert::GrabInformationsFromHeader: " "unable to read red LUT data" ); } } @@ -890,7 +890,7 @@ void PixelConvert::GrabInformationsFromHeader( Header* header ) fp->read( (char*)LutGreenData, (size_t)lutGreenDataEntry->GetLength() ); if ( fp->fail() || fp->eof())//Fp->gcount() == 1 { - dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: " + dbg.Verbose(0, "PixelReadConvert::GrabInformationsFromHeader: " "unable to read green LUT data" ); } } @@ -907,7 +907,7 @@ void PixelConvert::GrabInformationsFromHeader( Header* header ) fp->read( (char*)LutBlueData, (size_t)lutBlueDataEntry->GetLength() ); if ( fp->fail() || fp->eof())//Fp->gcount() == 1 { - dbg.Verbose(0, "PixelConvert::GrabInformationsFromHeader: " + dbg.Verbose(0, "PixelReadConvert::GrabInformationsFromHeader: " "unable to read blue LUT data" ); } } @@ -936,7 +936,7 @@ void PixelConvert::GrabInformationsFromHeader( Header* header ) * no known Dicom reader deals with them :-( * @return a RGBA Lookup Table */ -void PixelConvert::BuildLUTRGBA() +void PixelReadConvert::BuildLUTRGBA() { if ( LutRGBA ) { @@ -967,7 +967,7 @@ void PixelConvert::BuildLUTRGBA() &lengthR, &debR, &nbitsR ); if( nbRead != 3 ) { - dbg.Verbose(0, "PixelConvert::BuildLUTRGBA: wrong red LUT descriptor"); + dbg.Verbose(0, "PixelReadConvert::BuildLUTRGBA: wrong red LUT descriptor"); } int lengthG; // Green LUT length in Bytes @@ -978,7 +978,7 @@ void PixelConvert::BuildLUTRGBA() &lengthG, &debG, &nbitsG ); if( nbRead != 3 ) { - dbg.Verbose(0, "PixelConvert::BuildLUTRGBA: wrong green LUT descriptor"); + dbg.Verbose(0, "PixelReadConvert::BuildLUTRGBA: wrong green LUT descriptor"); } int lengthB; // Blue LUT length in Bytes @@ -989,7 +989,7 @@ void PixelConvert::BuildLUTRGBA() &lengthB, &debB, &nbitsB ); if( nbRead != 3 ) { - dbg.Verbose(0, "PixelConvert::BuildLUTRGBA: wrong blue LUT descriptor"); + dbg.Verbose(0, "PixelReadConvert::BuildLUTRGBA: wrong blue LUT descriptor"); } //////////////////////////////////////////////////////// @@ -1059,7 +1059,7 @@ void PixelConvert::BuildLUTRGBA() /** * \brief Build the RGB image from the Decompressed imagage and the LUTs. */ -bool PixelConvert::BuildRGBImage() +bool PixelReadConvert::BuildRGBImage() { if ( RGB ) { @@ -1098,7 +1098,7 @@ bool PixelConvert::BuildRGBImage() * @param indent Indentation string to be prepended during printing. * @param os Stream to print to. */ -void PixelConvert::Print( std::string indent, std::ostream &os ) +void PixelReadConvert::Print( std::string indent, std::ostream &os ) { os << indent << "--- Pixel information -------------------------" @@ -1118,7 +1118,7 @@ void PixelConvert::Print( std::string indent, std::ostream &os ) } else { - dbg.Verbose(0, "PixelConvert::Print: set as RLE file " + dbg.Verbose(0, "PixelReadConvert::Print: set as RLE file " "but NO RLEinfo present."); } } @@ -1131,7 +1131,7 @@ void PixelConvert::Print( std::string indent, std::ostream &os ) } else { - dbg.Verbose(0, "PixelConvert::Print: set as JPEG file " + dbg.Verbose(0, "PixelReadConvert::Print: set as JPEG file " "but NO JPEGinfo present."); } } diff --git a/src/gdcmPixelConvert.h b/src/gdcmPixelReadConvert.h similarity index 93% rename from src/gdcmPixelConvert.h rename to src/gdcmPixelReadConvert.h index 074db2ba..72bdf526 100644 --- a/src/gdcmPixelConvert.h +++ b/src/gdcmPixelReadConvert.h @@ -1,10 +1,10 @@ /*========================================================================= Program: gdcm - Module: $RCSfile: gdcmPixelConvert.h,v $ + Module: $RCSfile: gdcmPixelReadConvert.h,v $ Language: C++ - Date: $Date: 2004/10/25 04:08:20 $ - Version: $Revision: 1.14 $ + Date: $Date: 2004/12/03 10:21:55 $ + Version: $Revision: 1.1 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -17,8 +17,8 @@ =========================================================================*/ -#ifndef GDCMPIXELCONVERT_H -#define GDCMPIXELCONVERT_H +#ifndef GDCMPIXELREADCONVERT_H +#define GDCMPIXELREADCONVERT_H #include "gdcmCommon.h" #include "gdcmRLEFramesInfo.h" @@ -32,11 +32,11 @@ namespace gdcm * \brief Utility container for gathering the various forms the pixel data * migth take during the user demanded processes. */ -class GDCM_EXPORT PixelConvert +class GDCM_EXPORT PixelReadConvert { public: - PixelConvert(); - ~PixelConvert(); + PixelReadConvert(); + ~PixelReadConvert(); //// Getter accessors: uint8_t* GetRGB() { return RGB; } diff --git a/src/gdcmRLEFrame.h b/src/gdcmRLEFrame.h index 84d3966b..735ffffe 100644 --- a/src/gdcmRLEFrame.h +++ b/src/gdcmRLEFrame.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmRLEFrame.h,v $ Language: C++ - Date: $Date: 2004/10/22 13:56:46 $ - Version: $Revision: 1.8 $ + Date: $Date: 2004/12/03 10:21:54 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -44,7 +44,7 @@ namespace gdcm class GDCM_EXPORT RLEFrame { friend class Document; -friend class PixelConvert; +friend class PixelReadConvert; unsigned int NumberFragments; long Offset[15]; long Length[15]; diff --git a/src/gdcmRLEFramesInfo.h b/src/gdcmRLEFramesInfo.h index 5afa003e..f712f959 100644 --- a/src/gdcmRLEFramesInfo.h +++ b/src/gdcmRLEFramesInfo.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmRLEFramesInfo.h,v $ Language: C++ - Date: $Date: 2004/10/20 14:30:40 $ - Version: $Revision: 1.6 $ + Date: $Date: 2004/12/03 10:21:54 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -44,7 +44,7 @@ class GDCM_EXPORT RLEFramesInfo typedef std::list< RLEFrame* > RLEFrameList; friend class Document; friend class File; -friend class PixelConvert; +friend class PixelReadConvert; RLEFrameList Frames; public: ~RLEFramesInfo();