X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmPixelReadConvert.cxx;h=8048fbab973366e52aa6191c59c46c40dc4c158d;hb=7e9537ac534af5c5b9c5231c1b7fdd7193c2255d;hp=3cddb493b164d9839283df1ad8d2a06111f56a3d;hpb=09df242a0fd3c71c18ca62fc0a8d87713f53e217;p=gdcm.git diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index 3cddb493..8048fbab 100644 --- a/src/gdcmPixelReadConvert.cxx +++ b/src/gdcmPixelReadConvert.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmPixelReadConvert.cxx,v $ Language: C++ - Date: $Date: 2005/01/14 15:06:37 $ - Version: $Revision: 1.27 $ + Date: $Date: 2005/01/17 03:05:55 $ + Version: $Revision: 1.30 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -38,30 +38,6 @@ namespace gdcm { #define str2num(str, typeNum) *((typeNum *)(str)) -// For JPEG 2000, body in file gdcmJpeg2000.cxx -bool gdcm_read_JPEG2000_file (std::ifstream* fp, void* image_buffer); - -#define JOCTET uint8_t -// For JPEG 8 Bits, body in file gdcmJpeg8.cxx -bool gdcm_read_JPEG_file8 (std::ifstream *fp, void *image_buffer); -bool gdcm_read_JPEG_memory8 (const JOCTET *buffer, const size_t buflen, - void *image_buffer, - size_t *howManyRead, size_t *howManyWritten); -// -// For JPEG 12 Bits, body in file gdcmJpeg12.cxx -bool gdcm_read_JPEG_file12 (std::ifstream *fp, void *image_buffer); -bool gdcm_read_JPEG_memory12 (const JOCTET *buffer, const size_t buflen, - void *image_buffer, - size_t *howManyRead, size_t *howManyWritten); - -// For JPEG 16 Bits, body in file gdcmJpeg16.cxx -// Beware this is misleading there is no 16bits DCT algorithm, only -// jpeg lossless compression exist in 16bits. -bool gdcm_read_JPEG_file16 (std::ifstream *fp, void *image_buffer); -bool gdcm_read_JPEG_memory16 (const JOCTET *buffer, const size_t buflen, - void* image_buffer, - size_t *howManyRead, size_t *howManyWritten); - //----------------------------------------------------------------------------- // Constructor / Destructor @@ -391,9 +367,9 @@ void PixelReadConvert::ConvertReorderEndianity() } // Special kludge in order to deal with xmedcon broken images: - if ( ( BitsAllocated == 16 ) - && ( BitsStored < BitsAllocated ) - && ( ! PixelSign ) ) + if ( BitsAllocated == 16 + && BitsStored < BitsAllocated + && !PixelSign ) { int l = (int)( RawSize / ( BitsAllocated / 8 ) ); uint16_t *deb = (uint16_t *)Raw; @@ -418,51 +394,23 @@ void PixelReadConvert::ConvertReorderEndianity() */ bool PixelReadConvert::ReadAndDecompressJPEGFramesFromFile( std::ifstream *fp ) { + // Pointer to the Raw image uint8_t *localRaw = Raw; + + // Precompute the offset localRaw will be shifted with + int length = XSize * YSize * SamplesPerPixel; + int numberBytes = BitsAllocated / 8; + // Loop on the fragment[s] for( JPEGFragmentsInfo::JPEGFragmentsList::iterator it = JPEGInfo->Fragments.begin(); it != JPEGInfo->Fragments.end(); ++it ) { - fp->seekg( (*it)->Offset, std::ios::beg); - - if ( BitsStored == 8) - { - // JPEG Lossy : call to IJG 6b - if ( ! gdcm_read_JPEG_file8( fp, localRaw ) ) - { - return false; - } - } - else if ( BitsStored <= 12) - { - // Reading Fragment pixels - if ( ! gdcm_read_JPEG_file12 ( fp, localRaw ) ) - { - return false; - } - } - else if ( BitsStored <= 16) - { - // Reading Fragment pixels - if ( ! gdcm_read_JPEG_file16 ( fp, localRaw ) ) - { - return false; - } - //gdcmAssertMacro( IsJPEGLossless ); - } - else - { - // other JPEG lossy not supported - gdcmErrorMacro( "Unknown jpeg lossy compression "); - return false; - } + (*it)->DecompressJPEGFramesFromFile(fp, localRaw, BitsStored ); // Advance to next free location in Raw // for next fragment decompression (if any) - int length = XSize * YSize * SamplesPerPixel; - int numberBytes = BitsAllocated / 8; localRaw += length * numberBytes; } @@ -482,71 +430,16 @@ bool PixelReadConvert:: ReadAndDecompressJPEGSingleFrameFragmentsFromFile( std::ifstream *fp ) { // Loop on the fragment[s] to get total length - size_t totalLength = 0; - JPEGFragmentsInfo::JPEGFragmentsList::iterator it; - for( it = JPEGInfo->Fragments.begin(); - it != JPEGInfo->Fragments.end(); - ++it ) - { - totalLength += (*it)->Length; - } + size_t totalLength = JPEGInfo->GetFragmentsLength(); // Concatenate the jpeg fragments into a local buffer JOCTET *buffer = new JOCTET [totalLength]; - JOCTET *p = buffer; + // Fill in the buffer: + JPEGInfo->ReadAllFragments(fp, buffer); - // Loop on the fragment[s] - for( it = JPEGInfo->Fragments.begin(); - it != JPEGInfo->Fragments.end(); - ++it ) - { - fp->seekg( (*it)->Offset, std::ios::beg); - size_t len = (*it)->Length; - fp->read((char *)p,len); - p += len; - } - - size_t howManyRead = 0; - size_t howManyWritten = 0; - - if ( BitsStored == 8) - { - if ( ! gdcm_read_JPEG_memory8( buffer, totalLength, Raw, - &howManyRead, &howManyWritten ) ) - { - gdcmErrorMacro( "Failed to read jpeg8 "); - delete [] buffer; - return false; - } - } - else if ( BitsStored <= 12) - { - if ( ! gdcm_read_JPEG_memory12( buffer, totalLength, Raw, - &howManyRead, &howManyWritten ) ) - { - gdcmErrorMacro( "Failed to read jpeg12 "); - delete [] buffer; - return false; - } - } - else if ( BitsStored <= 16) - { - - if ( ! gdcm_read_JPEG_memory16( buffer, totalLength, Raw, - &howManyRead, &howManyWritten ) ) - { - gdcmErrorMacro( "Failed to read jpeg16 "); - delete [] buffer; - return false; - } - } - else - { - // other JPEG lossy not supported - gdcmErrorMacro( "Unsupported jpeg lossy compression "); - delete [] buffer; - return false; - } + // kludge: // FIXME + JPEGFragmentsInfo::JPEGFragmentsList::const_iterator it = JPEGInfo->Fragments.begin(); + (*it)->DecompressJPEGSingleFrameFragmentsFromFile(buffer, totalLength, Raw, BitsStored); // free local buffer delete [] buffer; @@ -567,34 +460,18 @@ bool PixelReadConvert:: ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp ) { // Loop on the fragment[s] to get total length - size_t totalLength = 0; - JPEGFragmentsInfo::JPEGFragmentsList::iterator it; - for( it = JPEGInfo->Fragments.begin(); - it != JPEGInfo->Fragments.end(); - ++it ) - { - totalLength += (*it)->Length; - } + size_t totalLength = JPEGInfo->GetFragmentsLength(); // Concatenate the jpeg fragments into a local buffer JOCTET *buffer = new JOCTET [totalLength]; - JOCTET *p = buffer; - - // Loop on the fragment[s] - for( it = JPEGInfo->Fragments.begin(); - it != JPEGInfo->Fragments.end(); - ++it ) - { - fp->seekg( (*it)->Offset, std::ios::beg); - size_t len = (*it)->Length; - fp->read((char *)p,len); - p+=len; - } + // Fill in the buffer: + JPEGInfo->ReadAllFragments(fp, buffer); size_t howManyRead = 0; size_t howManyWritten = 0; size_t fragmentLength = 0; + JPEGFragmentsInfo::JPEGFragmentsList::const_iterator it; for( it = JPEGInfo->Fragments.begin() ; (it != JPEGInfo->Fragments.end()) && (howManyRead < totalLength); ++it ) @@ -602,49 +479,8 @@ ReadAndDecompressJPEGFragmentedFramesFromFile( std::ifstream *fp ) fragmentLength += (*it)->Length; if (howManyRead > fragmentLength) continue; - - if ( BitsStored == 8) - { - if ( ! gdcm_read_JPEG_memory8( buffer+howManyRead, totalLength-howManyRead, - Raw+howManyWritten, - &howManyRead, &howManyWritten ) ) - { - gdcmErrorMacro( "Failed to read jpeg8"); - delete [] buffer; - return false; - } - } - else if ( BitsStored <= 12) - { - if ( ! gdcm_read_JPEG_memory12( buffer+howManyRead, totalLength-howManyRead, - Raw+howManyWritten, - &howManyRead, &howManyWritten ) ) - { - gdcmErrorMacro( "Failed to read jpeg12"); - delete [] buffer; - return false; - } - } - else if ( BitsStored <= 16) - { - - if ( ! gdcm_read_JPEG_memory16( buffer+howManyRead, totalLength-howManyRead, - Raw+howManyWritten, - &howManyRead, &howManyWritten ) ) - { - gdcmErrorMacro( "Failed to read jpeg16 "); - delete [] buffer; - return false; - } - } - else - { - // other JPEG lossy not supported - gdcmErrorMacro( "Unsupported jpeg lossy compression "); - delete [] buffer; - return false; - } + (*it)->DecompressJPEGFragmentedFramesFromFile(buffer, Raw, BitsStored, howManyRead, howManyWritten, totalLength); if (howManyRead < fragmentLength) howManyRead = fragmentLength; @@ -667,7 +503,7 @@ bool PixelReadConvert::ReadAndDecompressJPEGFile( std::ifstream *fp ) if ( IsJPEG2000 ) { fp->seekg( (*JPEGInfo->Fragments.begin())->Offset, std::ios::beg); - if ( ! gdcm_read_JPEG2000_file( fp,Raw ) ) +// if ( ! gdcm_read_JPEG2000_file( fp,Raw ) ) return false; } @@ -1278,21 +1114,12 @@ bool PixelReadConvert::BuildRGBImage() return true; } -/** - * \brief Print self. - * @param os Stream to print to. - */ -void PixelReadConvert::Print( std::ostream &os ) -{ - Print("",os); -} - /** * \brief Print self. * @param indent Indentation string to be prepended during printing. * @param os Stream to print to. */ -void PixelReadConvert::Print( std::string indent, std::ostream &os ) +void PixelReadConvert::Print( std::ostream &os, std::string const & indent ) { os << indent << "--- Pixel information -------------------------" @@ -1308,7 +1135,7 @@ void PixelReadConvert::Print( std::string indent, std::ostream &os ) { if ( RLEInfo ) { - RLEInfo->Print( indent, os ); + RLEInfo->Print( os, indent ); } else { @@ -1320,7 +1147,7 @@ void PixelReadConvert::Print( std::string indent, std::ostream &os ) { if ( JPEGInfo ) { - JPEGInfo->Print( indent, os ); + JPEGInfo->Print( os, indent ); } else {