ENH: adding mangle names for 8bits and 12bits

[gdcm.git] / src / gdcmRLE.cxx

diff --git a/src/gdcmRLE.cxx b/src/gdcmRLE.cxx
index 72cf33403d244acd98670b8c02ad26fb964c259b..8854b2fbf968a0e9d2517712c2bbf00fcefcd715 100644 (file)
--- a/src/gdcmRLE.cxx
+++ b/src/gdcmRLE.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmRLE.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/23 03:36:24 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2004/09/27 08:39:07 $
+  Version:   $Revision: 1.23 $
                                                                                 
   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.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -31,15 +31,15 @@
  *            at which the pixel data should be copied 
  * @return    Boolean 
  */
-bool gdcmFile::gdcm_read_RLE_file (FILE *fp,void * image_buffer) {
+bool gdcmFile::gdcm_read_RLE_file (FILE* fp,void* image_buffer) {
    long fragmentBegining; // for ftell, fseek
    char * im = (char *)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,7 +141,7 @@ 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;
    }
       
@@ -151,9 +151,9 @@ 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
+int gdcmFile::gdcm_read_RLE_fragment(char** areaToRead, long lengthToDecode, 
+                                     long uncompressedSegmentSize, FILE* fp) {
+   (void)lengthToDecode; //FIXME
    long ftellRes;
    int count;
    long numberOfOutputBytes=0;