+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: gdcmRLE.cxx,v $
+ Language: C++
+ Date: $Date: 2004/06/23 03:36:24 $
+ Version: $Revision: 1.19 $
+
+ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+ l'Image). All rights reserved. See Doc/License.txt or
+ http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+
+ This software is distributed WITHOUT ANY WARRANTY; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE. See the above copyright notices for more information.
+
+=========================================================================*/
#include <stdio.h>
#include "gdcmFile.h"
-#include <ctype.h> /* to declare isprint() */
+#include <ctype.h> // For 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
-
-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
/**
* \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
-
-// pb with RLE 16 Bits :
-
-
-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;
guint32 nbRleSegments;
guint32 RleSegmentOffsetTable[15];
guint16 ItemTagGr,ItemTagEl;
- uncompressedSegmentSize=GetXSize()*GetYSize();
+ 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);
}
// Item Length
ftellRes=ftell(fp);
fread(&ln,4,1,fp);
- if(GetSwapCode())
- ln=SwapLong(ln); // Basic Offset Table Item Lentgh
+ 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);
+ char * BasicOffsetTableItemValue= new char[ln+1];
fread(BasicOffsetTableItemValue,ln,1,fp);
guint32 a;
for (int i=0;i<ln;i+=4){
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);
}
// while 'Sequence Delimiter Item' (fffe,e0dd) not found
// Parse fragments of the current Fragment (Frame)
ftellRes=ftell(fp);
fread(&fragmentLength,4,1,fp);
- if(GetSwapCode())
- fragmentLength=SwapLong(fragmentLength); // length
+ 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(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(Header->GetSwapCode())
+ RleSegmentOffsetTable[k]=Header->SwapLong(RleSegmentOffsetTable[k]);
}
if (nbRleSegments>1) {
- for(int k=1; k<=nbRleSegments-1; k++) { // reading RLE Segments
+ 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);
+ 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);
+ gdcm_read_RLE_fragment (&im, RleSegmentLength[nbRleSegments],uncompressedSegmentSize, fp);
fseek(fp,fragmentBegining,SEEK_SET);
fseek(fp,RleSegmentLength[nbRleSegments],SEEK_CUR);
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 (GetBitsAllocated()==16) { // try to deal with RLE 16 Bits
+ 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 = GetXSize()*GetYSize();
- int nbFrames = GetZSize();
+ int l = Header->GetXSize()*Header->GetYSize();
+ int nbFrames = Header->GetZSize();
- char * newDest = (char*) malloc(l*nbFrames*2);
+ char * newDest = new char[l*nbFrames*2];
char *x = newDest;
char * a = (char *)image_buffer;
char * b = a + l;
}
}
memmove(image_buffer,newDest,lgrTotale);
- free(newDest);
+ delete[] newDest;
}
- return (1);
+ return true;
}
- /* -------------------------------------------------------------------- */
- //
- // RLE LossLess Fragment
- //
- /* -------------------------------------------------------------------- */
-
- // static because nothing but gdcm_read_RLE_file can call it
- // DO NOT doxygen !
-
-static int
-_gdcm_read_RLE_fragment (char ** areaToRead,
- long lengthToDecode,
- long uncompressedSegmentSize,
- FILE* fp) {
+// ----------------------------------------------------------------------------
+// RLE LossLess Fragment
+int gdcmFile::gdcm_read_RLE_fragment(char **areaToRead, long lengthToDecode,
+ long uncompressedSegmentSize, FILE *fp) {
+ (void)lengthToDecode; //FIXME
long ftellRes;
int count;
long numberOfOutputBytes=0;
ftellRes =ftell(fp);
while(numberOfOutputBytes<uncompressedSegmentSize) {
-
ftellRes =ftell(fp);
fread(&n,sizeof(char),1,fp);
count=n;
}
return 1;
}
+
+// ----------------------------------------------------------------------------
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff