Program: gdcm
Module: $RCSfile: gdcmRLEFramesInfo.cxx,v $
Language: C++
- Date: $Date: 2005/02/01 13:00:16 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2006/01/27 10:01:34 $
+ Version: $Revision: 1.20 $
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"
+
+#if defined(__BORLANDC__)
+ #include <mem.h> // for memset
+#endif
namespace gdcm
{
* \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 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 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;
- uint8_t* x = raw;
- uint8_t* a = copyRaw;
- uint8_t* b = a + pixelNumber;
+ // Warning : unckecked patch to see the behaviour on Big Endian Processors
+ 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++ )
*(x++) = *(a++);
}
}
- delete[] copyRaw;
- /// \todo check that operator new []didn't fail, and sometimes return false
+ delete[] copyRaw;
return true;
}