X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLE.cxx;h=14f2431c5b465a0976d14c78facfcbcd9bda39e7;hb=9a8932b74aab77d55d7b478b1996611c7d588daa;hp=2f38ae1756c911ec17335a9ad9e14e6e5330f939;hpb=1a11accd11061d63d3c09db7b1445637207e81e4;p=gdcm.git diff --git a/src/gdcmRLE.cxx b/src/gdcmRLE.cxx index 2f38ae17..14f2431c 100644 --- a/src/gdcmRLE.cxx +++ b/src/gdcmRLE.cxx @@ -41,7 +41,7 @@ bool gdcmFile::gdcm_read_RLE_file (FILE *fp,void * image_buffer) { 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;i1) { - 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); @@ -114,7 +114,7 @@ bool gdcmFile::gdcm_read_RLE_file (FILE *fp,void * image_buffer) { 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; @@ -126,7 +126,7 @@ bool gdcmFile::gdcm_read_RLE_file (FILE *fp,void * image_buffer) { } } memmove(image_buffer,newDest,lgrTotale); - free(newDest); + delete[] newDest; } return(true); @@ -137,6 +137,7 @@ bool gdcmFile::gdcm_read_RLE_file (FILE *fp,void * image_buffer) { // 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;