From d65508e83c169bde30eecaed0ca1c5ce6d0eebcb Mon Sep 17 00:00:00 2001 From: frog Date: Wed, 6 Oct 2004 22:31:31 +0000 Subject: [PATCH] * CLEANUP_ROUND (6) for gdcmPixelConvert (man, I need a paddle bad) - src/gdcmRLE.cxx: is now much simpler and avoids code replication with the retired Parse7FE0(). - src/gdcmRLEFrame.h: type fix for properly computing OffSet[] - src/gdcmDocument.cxx: segments offset are now correct + clean up. --- ChangeLog | 5 ++ src/gdcmDocument.cxx | 14 +++--- src/gdcmRLE.cxx | 112 ++++++++----------------------------------- src/gdcmRLEFrame.h | 6 +-- 4 files changed, 34 insertions(+), 103 deletions(-) diff --git a/ChangeLog b/ChangeLog index 181c9cef..fe76d8f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,11 @@ Hence Parse7Fe0 was no longer necessary. When renaming to ComputeRLEInfo we just recylce the code for parsing RLE fragments and computing offsets. + * CLEANUP_ROUND (6) for gdcmPixelConvert (man, I need a paddle bad) + - src/gdcmRLE.cxx: is now much simpler and avoids code replication + with the retired Parse7Fe0(). + - src/gdcmRLEFrame.h: type fix for properly computing OffSet[] + - src/gdcmDocument.cxx: segments offset are now correct + clean up. 2004-10-06 Eric Boix * CLEANUP_ROUND (3) for gdcmPixelConvert (nightmare stage) diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx index 45f88344..857f12de 100644 --- a/src/gdcmDocument.cxx +++ b/src/gdcmDocument.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDocument.cxx,v $ Language: C++ - Date: $Date: 2004/10/06 21:30:02 $ - Version: $Revision: 1.95 $ + Date: $Date: 2004/10/06 22:31:31 $ + Version: $Revision: 1.96 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -2894,18 +2894,18 @@ void gdcmDocument::ComputeRLEInfo() // Offset Table information on fragments of this current Frame. // Note that the fragment pixels themselves are not loaded // (but just skipped). + long frameOffset = ftell(Fp); + uint32_t nbRleSegments = ReadInt32(); uint32_t rleSegmentOffsetTable[15]; - long ftellRes; for( int k = 1; k <= 15; k++ ) { - ftellRes = ftell(Fp); rleSegmentOffsetTable[k] = ReadInt32(); } // Deduce from both the RLE Header and the frameLength the - // fragment length, and again store this infor in a + // fragment length, and again store this info in a // gdcmRLEFramesInfo. long rleSegmentLength[15]; // skipping (not reading) RLE Segments @@ -2915,14 +2915,12 @@ void gdcmDocument::ComputeRLEInfo() { rleSegmentLength[k] = rleSegmentOffsetTable[k+1] - rleSegmentOffsetTable[k]; - ftellRes = ftell(Fp); SkipBytes(rleSegmentLength[k]); } } rleSegmentLength[nbRleSegments] = frameLength - rleSegmentOffsetTable[nbRleSegments]; - ftellRes = ftell(Fp); SkipBytes(rleSegmentLength[nbRleSegments]); // Store the collected info @@ -2930,7 +2928,7 @@ void gdcmDocument::ComputeRLEInfo() newFrameInfo->NumberFragments = nbRleSegments; for( unsigned int k = 1; k <= nbRleSegments; k++ ) { - newFrameInfo->Offset[k] = rleSegmentOffsetTable[k]; + newFrameInfo->Offset[k] = frameOffset + rleSegmentOffsetTable[k]; newFrameInfo->Length[k] = rleSegmentLength[k]; } RLEInfo.Frames.push_back( newFrameInfo ); diff --git a/src/gdcmRLE.cxx b/src/gdcmRLE.cxx index 8854b2fb..fd2cf2b3 100644 --- a/src/gdcmRLE.cxx +++ b/src/gdcmRLE.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmRLE.cxx,v $ Language: C++ - Date: $Date: 2004/09/27 08:39:07 $ - Version: $Revision: 1.23 $ + Date: $Date: 2004/10/06 22:31:31 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -32,96 +32,26 @@ * @return Boolean */ bool gdcmFile::gdcm_read_RLE_file (FILE* fp,void* image_buffer) { - long fragmentBegining; // for ftell, fseek char * im = (char *)image_buffer; + long uncompressedSegmentSize = Header->GetXSize() * Header->GetYSize(); + - long RleSegmentLength[15],fragmentLength,uncompressedSegmentSize;; - long ftellRes, ln; - uint32_t nbRleSegments; - uint32_t RleSegmentOffsetTable[15]; - uint16_t ItemTagGr,ItemTagEl; - 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(Header->GetSwapCode()) { - ItemTagGr=Header->SwapShort(ItemTagGr); - ItemTagEl=Header->SwapShort(ItemTagEl); - } - // Item Length - ftellRes=ftell(fp); - fread(&ln,4,1,fp); - if(Header->GetSwapCode()) - ln=Header->SwapLong(ln); // Basic Offset Table Item Lentgh - if (ln != 0) { - // What is it used for ?? - char * BasicOffsetTableItemValue= new char[ln+1]; - fread(BasicOffsetTableItemValue,ln,1,fp); - uint32_t a; - for (int i=0;iGetSwapCode()) { - ItemTagGr=Header->SwapShort(ItemTagGr); - ItemTagEl=Header->SwapShort(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(Header->GetSwapCode()) - fragmentLength=Header->SwapLong(fragmentLength); // length - - //------------------ scanning (not reading) fragment pixels - - fread(&nbRleSegments,4,1,fp); // Reading : Number of RLE Segments - 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(Header->GetSwapCode()) - RleSegmentOffsetTable[k]=Header->SwapLong(RleSegmentOffsetTable[k]); + // Loop on the frame[s] + for( gdcmRLEFramesInfo::RLEFrameList::iterator + it = Header->RLEInfo.Frames.begin(); + it != Header->RLEInfo.Frames.end(); + ++it ) + { + std::cout << "...new frame...\n "; + // Loop on the fragments + for( unsigned int k = 1; k <= (*it)->NumberFragments; k++ ) + { + fseek( fp, (*it)->Offset[k] ,SEEK_SET); + gdcm_read_RLE_fragment( &im, (*it)->Length[k], + uncompressedSegmentSize, fp ); } + } - if (nbRleSegments>1) { - for(unsigned int k=1; k<=nbRleSegments-1; k++) { // reading RLE Segments - RleSegmentLength[k]=RleSegmentOffsetTable[k+1]-RleSegmentOffsetTable[k]; - ftellRes=ftell(fp); - fragmentBegining=ftell(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); - fragmentBegining=ftell(fp); - gdcm_read_RLE_fragment (&im, RleSegmentLength[nbRleSegments],uncompressedSegmentSize, fp); - fseek(fp,fragmentBegining,SEEK_SET); - fseek(fp,RleSegmentLength[nbRleSegments],SEEK_CUR); - - // end of scanning fragment pixels - - ftellRes=ftell(fp); - fread(&ItemTagGr,2,1,fp); // Reading (fffe) : Item Tag Gr - fread(&ItemTagEl,2,1,fp); // Reading (e000) : Item Tag El - if(Header->GetSwapCode()) { - ItemTagGr=Header->SwapShort(ItemTagGr); - ItemTagEl=Header->SwapShort(ItemTagEl); - } - } - if (Header->GetBitsAllocated()==16) { // try to deal with RLE 16 Bits im = (char *)image_buffer; @@ -154,14 +84,12 @@ bool gdcmFile::gdcm_read_RLE_file (FILE* fp,void* image_buffer) { int gdcmFile::gdcm_read_RLE_fragment(char** areaToRead, long lengthToDecode, long uncompressedSegmentSize, FILE* fp) { (void)lengthToDecode; //FIXME - long ftellRes; int count; long numberOfOutputBytes=0; char n, car; - ftellRes =ftell(fp); - while(numberOfOutputBytes= 0 && count <= 127) { diff --git a/src/gdcmRLEFrame.h b/src/gdcmRLEFrame.h index 9b6ba025..3eb74aac 100644 --- a/src/gdcmRLEFrame.h +++ b/src/gdcmRLEFrame.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmRLEFrame.h,v $ Language: C++ - Date: $Date: 2004/10/06 09:58:08 $ - Version: $Revision: 1.1 $ + Date: $Date: 2004/10/06 22:31:31 $ + Version: $Revision: 1.2 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -42,7 +42,7 @@ class GDCM_EXPORT gdcmRLEFrame friend class gdcmDocument; friend class gdcmFile; int NumberFragments; - uint8_t Offset[15]; + long Offset[15]; long Length[15]; gdcmRLEFrame() { NumberFragments = 0; } -- 2.48.1