X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLE.cxx;h=2f38ae1756c911ec17335a9ad9e14e6e5330f939;hb=81e328d78c2028a7c2ecb86e6cee04839f4d56b2;hp=7bdcee608734f544bf3e5fbb531c1c362d386602;hpb=48d629b49cc690bcd26f6721f38af0ca876be417;p=gdcm.git diff --git a/src/gdcmRLE.cxx b/src/gdcmRLE.cxx index 7bdcee60..2f38ae17 100644 --- a/src/gdcmRLE.cxx +++ b/src/gdcmRLE.cxx @@ -1,73 +1,44 @@ -//This is needed when compiling in debug mode -#ifdef _MSC_VER -// 'identifier' : class 'type' needs to have dll-interface to be used by -// clients of class 'type2' -#pragma warning ( disable : 4251 ) -// 'identifier' : identifier was truncated to 'number' characters in the -// debug information -#pragma warning ( disable : 4786 ) -#endif //_MSC_VER - +// gdcmRLE.cxx +//----------------------------------------------------------------------------- #include #include "gdcmFile.h" -#include /* to declare isprint() */ +#include // to declare isprint() #define str2num(str, typeNum) *((typeNum *)(str)) -static int _gdcm_read_RLE_fragment (char ** image_buffer, - long lengthToDecode, - long uncompressedSegmentSize, - FILE* fp); -// static because nothing but gdcm_read_RLE_file may call it - -#define DEBUG 0 -// Will be removed - -// ---------------------------------------------------------------------------- +//----------------------------------------------------------------------------- /** * \ingroup gdcmFile * \brief Reads a 'Run Length Encoded' Dicom encapsulated file + * @param fp already open File Pointer * @param image_buffer destination Address (in caller's memory space) - * at which the - * pixel data should be copied - * @return int acts as a Boolean + * at which the pixel data should be copied + * @return Boolean */ - -// This is a debug version. -// Forget the printf as they will be removed -// as soon as the last Heuristics are checked - -int -gdcmFile::gdcm_read_RLE_file (void * image_buffer) { +bool gdcmFile::gdcm_read_RLE_file (FILE *fp,void * image_buffer) { long fragmentBegining; // for ftell, fseek char * im = (char *)image_buffer; - if (DEBUG)std::cout << "RLE image" << std::endl; long RleSegmentLength[15],fragmentLength,uncompressedSegmentSize;; long ftellRes, ln; guint32 nbRleSegments; guint32 RleSegmentOffsetTable[15]; guint16 ItemTagGr,ItemTagEl; - uncompressedSegmentSize=GetXSize()*GetYSize(); - if (DEBUG)printf("uncompressedSegmentSize %d\n",uncompressedSegmentSize); + uncompressedSegmentSize=Header->GetXSize()*Header->GetYSize(); ftellRes=ftell(fp); // Basic Offset Table with Item Value // Item Tag fread(&ItemTagGr,2,1,fp); // Reading (fffe):Basic Offset Table Item Tag Gr fread(&ItemTagEl,2,1,fp); // Reading (e000):Basic Offset Table Item Tag El - if(GetSwapCode()) { - ItemTagGr=SwapShort(ItemTagGr); - ItemTagEl=SwapShort(ItemTagEl); + if(Header->GetSwapCode()) { + ItemTagGr=Header->SwapShort(ItemTagGr); + ItemTagEl=Header->SwapShort(ItemTagEl); } - if (DEBUG)printf ("at %x : ItemTag (should be fffe,e000): %04x,%04x\n", - ftellRes,ItemTagGr,ItemTagEl ); // Item Length ftellRes=ftell(fp); fread(&ln,4,1,fp); - if(GetSwapCode()) - ln=SwapLong(ln); // Basic Offset Table Item Lentgh - if (DEBUG)printf("at %x : Basic Offset Table Item Lentgh (??) %d x(%08x)\n", - ftellRes,ln,ln); + if(Header->GetSwapCode()) + ln=Header->SwapLong(ln); // Basic Offset Table Item Lentgh if (ln != 0) { // What is it used for ?? char * BasicOffsetTableItemValue= (char *)malloc(ln+1); @@ -75,66 +46,52 @@ gdcmFile::gdcm_read_RLE_file (void * image_buffer) { guint32 a; for (int i=0;iGetSwapCode()) { + ItemTagGr=Header->SwapShort(ItemTagGr); + ItemTagEl=Header->SwapShort(ItemTagEl); } - if (DEBUG)printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n", - ftellRes,ItemTagGr,ItemTagEl ); // while 'Sequence Delimiter Item' (fffe,e0dd) not found while ( ( ItemTagGr == 0xfffe) && (ItemTagEl != 0xe0dd) ) { // Parse fragments of the current Fragment (Frame) ftellRes=ftell(fp); fread(&fragmentLength,4,1,fp); - if(GetSwapCode()) - fragmentLength=SwapLong(fragmentLength); // length - if (DEBUG)printf(" at %x : fragment length %d x(%08x)\n", - ftellRes, fragmentLength,fragmentLength); + if(Header->GetSwapCode()) + fragmentLength=Header->SwapLong(fragmentLength); // length //------------------ scanning (not reading) fragment pixels fread(&nbRleSegments,4,1,fp); // Reading : Number of RLE Segments - if(GetSwapCode()) - nbRleSegments=SwapLong(nbRleSegments); - if (DEBUG)printf(" Nb of RLE Segments : %d\n",nbRleSegments); + if(Header->GetSwapCode()) + nbRleSegments=Header->SwapLong(nbRleSegments); for(int k=1; k<=15; k++) { // Reading RLE Segments Offset Table ftellRes=ftell(fp); fread(&RleSegmentOffsetTable[k],4,1,fp); - if(GetSwapCode()) - RleSegmentOffsetTable[k]=SwapLong(RleSegmentOffsetTable[k]); - if (DEBUG)printf(" at : %x Offset Segment %d : %d (%x)\n", - ftellRes,k,RleSegmentOffsetTable[k],RleSegmentOffsetTable[k]); + if(Header->GetSwapCode()) + RleSegmentOffsetTable[k]=Header->SwapLong(RleSegmentOffsetTable[k]); } if (nbRleSegments>1) { for(int k=1; k<=nbRleSegments-1; k++) { // reading RLE Segments RleSegmentLength[k]=RleSegmentOffsetTable[k+1]-RleSegmentOffsetTable[k]; ftellRes=ftell(fp); - if (DEBUG)printf (" (in) Segment %d : Length = %d x(%x) Start at %x\n", - k,RleSegmentLength[k],RleSegmentLength[k], ftellRes); fragmentBegining=ftell(fp); - _gdcm_read_RLE_fragment (&im, RleSegmentLength[k],uncompressedSegmentSize,fp); + gdcm_read_RLE_fragment (&im, RleSegmentLength[k],uncompressedSegmentSize,fp); fseek(fp,fragmentBegining,SEEK_SET); fseek(fp,RleSegmentLength[k],SEEK_CUR); } } RleSegmentLength[nbRleSegments] = fragmentLength - RleSegmentOffsetTable[nbRleSegments]; ftellRes=ftell(fp); - if (DEBUG)printf (" (out)Segment %d : Length = %d x(%x) Start at %x\n", - nbRleSegments, - RleSegmentLength[nbRleSegments],RleSegmentLength[nbRleSegments], - ftellRes); fragmentBegining=ftell(fp); - _gdcm_read_RLE_fragment (&im, RleSegmentLength[nbRleSegments],uncompressedSegmentSize, fp); + gdcm_read_RLE_fragment (&im, RleSegmentLength[nbRleSegments],uncompressedSegmentSize, fp); fseek(fp,fragmentBegining,SEEK_SET); fseek(fp,RleSegmentLength[nbRleSegments],SEEK_CUR); @@ -143,31 +100,43 @@ gdcmFile::gdcm_read_RLE_file (void * image_buffer) { ftellRes=ftell(fp); fread(&ItemTagGr,2,1,fp); // Reading (fffe) : Item Tag Gr fread(&ItemTagEl,2,1,fp); // Reading (e000) : Item Tag El - if(GetSwapCode()) { - ItemTagGr=SwapShort(ItemTagGr); - ItemTagEl=SwapShort(ItemTagEl); + if(Header->GetSwapCode()) { + ItemTagGr=Header->SwapShort(ItemTagGr); + ItemTagEl=Header->SwapShort(ItemTagEl); } - if (DEBUG)printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n", - ftellRes,ItemTagGr,ItemTagEl ); } - return (1); -} + + if (Header->GetBitsAllocated()==16) { // try to deal with RLE 16 Bits + + im = (char *)image_buffer; + // need to make 16 Bits Pixels from Low Byte and Hight Byte 'Planes' + int l = Header->GetXSize()*Header->GetYSize(); + int nbFrames = Header->GetZSize(); - /* -------------------------------------------------------------------- */ - // - // RLE LossLess Fragment - // - /* -------------------------------------------------------------------- */ + char * newDest = (char*) malloc(l*nbFrames*2); + char *x = newDest; + char * a = (char *)image_buffer; + char * b = a + l; + + for (int i=0;i