ENH: Minor patch, mostly cosmetic clean up

[gdcm.git] / src / gdcmRLE.cxx

diff --git a/src/gdcmRLE.cxx b/src/gdcmRLE.cxx
index 52f9a9f23927feb731ed0785304df96e33c32936..97a0627f959563982242c5106750abe3e415febc 100644 (file)
--- a/src/gdcmRLE.cxx
+++ b/src/gdcmRLE.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLE.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:48 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2004/07/02 13:55:28 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,9 +37,9 @@ bool gdcmFile::gdcm_read_RLE_file (FILE *fp,void * image_buffer) {
 
    long RleSegmentLength[15],fragmentLength,uncompressedSegmentSize;;
    long ftellRes, ln;
-   guint32 nbRleSegments;
-   guint32 RleSegmentOffsetTable[15];
-   guint16 ItemTagGr,ItemTagEl;
+   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
@@ -59,9 +59,9 @@ bool gdcmFile::gdcm_read_RLE_file (FILE *fp,void * image_buffer) {
       // What is it used for ??
       char * BasicOffsetTableItemValue= new char[ln+1];
       fread(BasicOffsetTableItemValue,ln,1,fp); 
-      guint32 a;
+      uint32_t a;
       for (int i=0;i<ln;i+=4){
-         a=str2num(&BasicOffsetTableItemValue[i],guint32);
+         a=str2num(&BasicOffsetTableItemValue[i],uint32_t);
       }        
    }
 
@@ -141,11 +141,11 @@ bool gdcmFile::gdcm_read_RLE_file (FILE *fp,void * image_buffer) {
             *(x++) = *(b++);
          }
       }
-      memmove(image_buffer,newDest,lgrTotale);
+      memmove(image_buffer,newDest,ImageDataSize);
       delete[] newDest;
    }
       
-   return(true);
+   return true;
 }
 
 
@@ -153,7 +153,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
+   (void)lengthToDecode; //FIXME
    long ftellRes;
    int count;
    long numberOfOutputBytes=0;