Program: gdcm
Module: $RCSfile: gdcmPixelReadConvert.cxx,v $
Language: C++
- Date: $Date: 2004/12/14 08:31:30 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2004/12/16 11:37:03 $
+ Version: $Revision: 1.12 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
*/
bool PixelReadConvert::DecompressRLE16BitsFromRLE8Bits( int NumberOfFrames )
{
- size_t PixelNumber = XSize * YSize;
- size_t RawSize = XSize * YSize * NumberOfFrames;
+ size_t pixelNumber = XSize * YSize;
+ size_t rawSize = XSize * YSize * NumberOfFrames;
// We assumed Raw contains the decoded RLE pixels but as
// 8 bits per pixel. In order to convert those pixels to 16 bits
// per pixel we cannot work in place within Raw and hence
// we copy it in a safe place, say copyRaw.
- uint8_t* copyRaw = new uint8_t[ RawSize * 2 ];
- memmove( copyRaw, Raw, RawSize * 2 );
+ uint8_t* copyRaw = new uint8_t[ rawSize * 2 ];
+ memmove( copyRaw, Raw, rawSize * 2 );
uint8_t* x = Raw;
uint8_t* a = copyRaw;
- uint8_t* b = a + PixelNumber;
+ uint8_t* b = a + pixelNumber;
for ( int i = 0; i < NumberOfFrames; i++ )
{
- for ( unsigned int j = 0; j < PixelNumber; j++ )
+ for ( unsigned int j = 0; j < pixelNumber; j++ )
{
*(x++) = *(b++);
*(x++) = *(a++);
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.
<< std::endl;
os << indent
<< "Pixel Data: offset " << PixelOffset
- << " x" << std::hex << PixelOffset << std::dec
- << " length " << PixelDataLength
- << " x" << std::hex << PixelDataLength << std::dec
- << std::endl;
+ << " x(" << std::hex << PixelOffset << std::dec
+ << ") length " << PixelDataLength
+ << " x(" << std::hex << PixelDataLength << std::dec
+ << ")" << std::endl;
if ( IsRLELossless )
{