Program: gdcm
Module: $RCSfile: gdcmRLEFramesInfo.cxx,v $
Language: C++
- Date: $Date: 2005/01/31 06:17:22 $
- Version: $Revision: 1.10 $
+ Date: $Date: 2005/09/07 08:49:58 $
+ Version: $Revision: 1.17 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmRLEFramesInfo.h"
#include "gdcmDebug.h"
+#include "gdcmUtil.h"
namespace gdcm
{
-
+//-------------------------------------------------------------------------
+// Constructor / Destructor
RLEFramesInfo::~RLEFramesInfo()
{
for(RLEFrameList::iterator it = Frames.begin(); it != Frames.end(); ++it)
Frames.clear();
}
-/**
- * \brief Print self.
- * @param indent Indentation string to be prepended during printing.
- * @param os Stream to print to.
- */
-void RLEFramesInfo::Print( std::ostream &os, std::string indent )
-{
- os << std::endl;
- os << indent
- << "----------------- RLE frames --------------------------------"
- << std::endl;
- os << indent
- << "Total number of Frames : " << Frames.size()
- << std::endl;
- int frameNumber = 0;
- for(RLEFrameList::iterator it = Frames.begin(); it != Frames.end(); ++it)
- {
- os << indent
- << " frame number :" << frameNumber++
- << std::endl;
- (*it)->Print( os, indent + " " );
- }
-}
-
+//-----------------------------------------------------------------------------
+// Public
void RLEFramesInfo::AddFrame(RLEFrame *frame)
{
Frames.push_back(frame);
* \brief Reads from disk the Pixel Data of 'Run Length Encoded'
* Dicom encapsulated file and decompress it.
* @param fp already open File Pointer
- * at which the pixel data should be copied
+ * from which the pixel data should be read
+ * @param raw raw
+ * @param xSize x Size
+ * @param ySize y Size
+ * @param zSize z Size
+ * @param bitsAllocated Bits allocated
* @return Boolean
*/
-bool RLEFramesInfo::DecompressRLEFile( std::ifstream *fp , uint8_t *raw, int xSize, int ySize, int zSize, int bitsAllocated )
+bool RLEFramesInfo::DecompressRLEFile( std::ifstream *fp , uint8_t *raw,
+ int xSize, int ySize, int zSize,
+ int bitsAllocated )
{
uint8_t *subRaw = raw;
long rawSegmentSize = xSize * ySize;
}
/**
- * \brief Try to deal with RLE 16 Bits.
- * We assume the RLE has already been parsed and loaded in
- * Raw (through \ref ReadAndDecompressJPEGFile ).
- * We here need to make 16 Bits Pixels from Low Byte and
- * High Byte 'Planes'...(for what it may mean)
- * @return Boolean
+ * \brief We assume Raw contains the decoded RLE pixels but as
+ * 8 bits per pixel. We convert those pixels to 16 bits
+ * per pixel.
+ * @param raw raw
+ * @param xSize x Size
+ * @param ySize y Size
+ * @param numberOfFrames number of frames
+ * @return Boolean always true
*/
-bool RLEFramesInfo::ConvertRLE16BitsFromRLE8Bits( uint8_t* raw, int xSize,
- int ySize,int numberOfFrames )
+bool RLEFramesInfo::ConvertRLE16BitsFromRLE8Bits(uint8_t *raw, int xSize,
+ int ySize, int numberOfFrames)
{
size_t pixelNumber = xSize * ySize;
- size_t rawSize = xSize * ySize * numberOfFrames;
+ size_t rawSize = pixelNumber * numberOfFrames * 2;
// 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];
+ memmove( copyRaw, raw, rawSize );
+
+ uint8_t *x = raw;
+ uint8_t *a;
+ uint8_t *b;
+
+ // Warning : unckecked patch to see the behaviour on Big Endian Processors
- uint8_t* x = raw;
- uint8_t* a = copyRaw;
- uint8_t* b = a + pixelNumber;
+ if ( !Util::IsCurrentProcessorBigEndian() )
+ {
+ a = copyRaw; // beginning of 'low bytes'
+ b = a + pixelNumber; // beginning of 'hight bytes'
+ }
+ else
+ {
+ b = copyRaw; // beginning of 'low bytes'
+ a = b + pixelNumber; // beginning of 'hight bytes'
+ }
+ // Re order bytes
for ( int i = 0; i < numberOfFrames; i++ )
{
for ( unsigned int j = 0; j < pixelNumber; j++ )
}
delete[] copyRaw;
-
- /// \todo check that operator new []didn't fail, and sometimes return false
+
return true;
}
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief Print self.
+ * @param indent Indentation string to be prepended during printing.
+ * @param os Stream to print to.
+ */
+void RLEFramesInfo::Print( std::ostream &os, std::string indent )
+{
+ os << std::endl;
+ os << indent
+ << "----------------- RLE frames --------------------------------"
+ << std::endl;
+ os << indent
+ << "Total number of Frames : " << Frames.size()
+ << std::endl;
+ int frameNumber = 0;
+ for(RLEFrameList::iterator it = Frames.begin(); it != Frames.end(); ++it)
+ {
+ os << indent
+ << " frame number :" << frameNumber++
+ << std::endl;
+ (*it)->Print( os, indent + " " );
+ }
+}
+//-----------------------------------------------------------------------------
} // end namespace gdcm