X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmRLE.cxx;h=72cf33403d244acd98670b8c02ad26fb964c259b;hb=d71e2e62b38383d9b960760f6d81c4d545d59fba;hp=358a041a722b775353bab55b769db93f8c21109d;hpb=6e80e9e7e9ca1926b3c10b029f8ba1e3f20ceaba;p=gdcm.git

diff --git a/src/gdcmRLE.cxx b/src/gdcmRLE.cxx
index 358a041a..72cf3340 100644
--- a/src/gdcmRLE.cxx
+++ b/src/gdcmRLE.cxx
@@ -1,180 +1,169 @@
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
+/*=========================================================================
+                                                                                
+  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
-
-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;
-   cout << "RLE image" << endl;
 
    long RleSegmentLength[15],fragmentLength,uncompressedSegmentSize;;
    long ftellRes, ln;
    guint32 nbRleSegments;
    guint32 RleSegmentOffsetTable[15];
    guint16 ItemTagGr,ItemTagEl;
-   uncompressedSegmentSize=GetXSize()*GetYSize();
-   printf("uncompressedSegmentSize %d\n",uncompressedSegmentSize);
+   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);      
    }
-   printf ("at %x : ItemTag (should be fffe,e000): %04x,%04x\n",
-          ftellRes,ItemTagGr,ItemTagEl );
       // Item Length
    ftellRes=ftell(fp);
    fread(&ln,4,1,fp); 
-   if(GetSwapCode()) 
-      ln=SwapLong(ln);    // Basic Offset Table Item Lentgh
-   printf("at %x : Basic Offset Table Item Lentgh (??) %d x(%08x)\n",
-         ftellRes,ln,ln);
+   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){
          a=str2num(&BasicOffsetTableItemValue[i],guint32);
-         printf("      x(%08x)  %d\n",a,a);
       }        
    }
 
    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);      
    }  
-   printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n",
-         ftellRes,ItemTagGr,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(GetSwapCode()) 
-         fragmentLength=SwapLong(fragmentLength);    // length
-      printf("      at %x : fragment length %d x(%08x)\n",
-             ftellRes, fragmentLength,fragmentLength);
+      if(Header->GetSwapCode()) 
+         fragmentLength=Header->SwapLong(fragmentLength);    // length
 
-       // scanning fragment pixels
+          //------------------ scanning (not reading) fragment pixels
  
       fread(&nbRleSegments,4,1,fp);  // Reading : Number of RLE Segments        
-      if(GetSwapCode()) 
-         nbRleSegments=SwapLong(nbRleSegments);
-         printf("         Nb of RLE Segments : %d\n",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]);
-         printf("        at : %x Offset Segment %d : %d (%x)\n",
-                   ftellRes,k,RleSegmentOffsetTable[k],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
-             RleSegmentLength[k]=RleSegmentOffsetTable[k+1]-RleSegmentOffsetTable[k];
-                ftellRes=ftell(fp);
-                printf ("        Segment %d : Length = %d Start at %x\n",
-                                 k,RleSegmentLength[k], ftellRes);    
-             _gdcm_read_RLE_fragment (&im, RleSegmentLength[k],uncompressedSegmentSize,fp);
-              //fseek(fp,RleSegmentLength[k],SEEK_CUR);    
-     
-          }
-       }
-       RleSegmentLength[nbRleSegments] = fragmentLength - RleSegmentOffsetTable[nbRleSegments]; // + 4;
-            // 4 : bytes for number of RLE Segments (WHY ???);
-                                           // TODO : Check the value
-          ftellRes=ftell(fp);
-          printf ("        Segment %d : Length = %d Start at %x\n",
-                           nbRleSegments,RleSegmentLength[nbRleSegments],ftellRes);
-       _gdcm_read_RLE_fragment (&im, RleSegmentLength[nbRleSegments],uncompressedSegmentSize, fp);
-        //fseek(fp,RleSegmentLength[nbRleSegments],SEEK_CUR);    
-  
-       
-      // end of scanning fragment pixels     
+      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(GetSwapCode()) {
-         ItemTagGr=SwapShort(ItemTagGr); 
-         ItemTagEl=SwapShort(ItemTagEl);      
+      if(Header->GetSwapCode()) {
+         ItemTagGr=Header->SwapShort(ItemTagGr); 
+         ItemTagEl=Header->SwapShort(ItemTagEl);      
       }
-      printf ("at %x : ItemTag (should be fffe,e000 or e0dd): %04x,%04x\n",
-            ftellRes,ItemTagGr,ItemTagEl );
    } 
-   return (1);
-}
+   
+   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 = Header->GetXSize()*Header->GetYSize();
+      int nbFrames = Header->GetZSize();
 
- /* -------------------------------------------------------------------- */
- //
- // RLE LossLess Fragment
- //
- /* -------------------------------------------------------------------- */
+      char * newDest = new char[l*nbFrames*2];
+      char *x  = newDest;
+      char * a = (char *)image_buffer;
+      char * b = a + l;
+
+      for (int i=0;i<nbFrames;i++) {
+         for (int j=0;j<l; j++) {
+            *(x++) = *(a++);
+            *(x++) = *(b++);
+         }
+      }
+      memmove(image_buffer,newDest,lgrTotale);
+      delete[] newDest;
+   }
+      
+   return true;
+}
 
-   // 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;
    char n, car;
    ftellRes =ftell(fp);
-   printf ("Fragment begin : %x lengthToDecode %d\n",ftellRes,lengthToDecode);
 
    while(numberOfOutputBytes<uncompressedSegmentSize) {
-
       ftellRes =ftell(fp);
       fread(&n,sizeof(char),1,fp);
       count=n;
-     //printf ("   Piece begin : %x count : %d x(%x)\n",ftellRes, count, count);
       if (count >= 0 && count <= 127) {
          fread(*areaToRead,(count+1)*sizeof(char),1,fp);
          *areaToRead+=count+1;
@@ -193,3 +182,5 @@ _gdcm_read_RLE_fragment (char ** areaToRead,
    } 
    return 1;
 }
+
+// ----------------------------------------------------------------------------