Program: gdcm
Module: $RCSfile: gdcmPixelReadConvert.cxx,v $
Language: C++
- Date: $Date: 2005/01/16 04:50:42 $
- Version: $Revision: 1.28 $
+ Date: $Date: 2005/01/21 11:40:55 $
+ Version: $Revision: 1.31 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
-////////////////// TEMPORARY NOTE
-// 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 PixelReadConvert everywhere and clean up !
-
#include "gdcmDebug.h"
-#include "gdcmHeader.h"
+#include "gdcmFile.h"
#include "gdcmGlobal.h"
#include "gdcmTS.h"
#include "gdcmPixelReadConvert.h"
{
#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
}
// 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;
*/
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;
}
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;
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 )
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;
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;
}
}
}
-void PixelReadConvert::GrabInformationsFromHeader( Header *header )
+void PixelReadConvert::GrabInformationsFromHeader( File *header )
{
// Number of Bits Allocated for storing a Pixel is defaulted to 16
// when absent from the header.
HasLUT = header->HasLUT();
if ( HasLUT )
{
- // Just in case some access to a Header element requires disk access.
+ // Just in case some access to a File element requires disk access.
LutRedDescriptor = header->GetEntry( 0x0028, 0x1101 );
LutGreenDescriptor = header->GetEntry( 0x0028, 0x1102 );
LutBlueDescriptor = header->GetEntry( 0x0028, 0x1103 );
// [ refer to invocation of Document::SetMaxSizeLoadEntry() in
// Document::Document() ], the loading of the value (content) of a
// [Bin|Val]Entry occurence migth have been hindered (read simply NOT
- // loaded). Hence, we first try to obtain the LUTs data from the header
- // and when this fails we read the LUTs data directely from disk.
+ // loaded). Hence, we first try to obtain the LUTs data from the file
+ // and when this fails we read the LUTs data directly from disk.
/// \TODO Reading a [Bin|Val]Entry directly from disk is a kludge.
/// We should NOT bypass the [Bin|Val]Entry class. Instead
/// an access to an UNLOADED content of a [Bin|Val]Entry occurence
}
/**
- * \brief Build Red/Green/Blue/Alpha LUT from Header
+ * \brief Build Red/Green/Blue/Alpha LUT from File
* when (0028,0004),Photometric Interpretation = [PALETTE COLOR ]
* and (0028,1101),(0028,1102),(0028,1102)
* - xxx Palette Color Lookup Table Descriptor - are found
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff