X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIORFImageReader.cpp;h=b1f23318750a494ec367d082e9a6f262da40a075;hb=46fb4b43011a4043c7b5ef2e7bd57e1695cd6b7f;hp=53111ac93e032316ea042c0e21de32d716c6b9df;hpb=86c8c6b0f5c28056b5d3ea1281cc244279ccb06b;p=creaImageIO.git

diff --git a/src2/creaImageIORFImageReader.cpp b/src2/creaImageIORFImageReader.cpp
index 53111ac..b1f2331 100644
--- a/src2/creaImageIORFImageReader.cpp
+++ b/src2/creaImageIORFImageReader.cpp
@@ -7,15 +7,6 @@ namespace creaImageIO
 {
 #define HEADER_SIZE 19
 
-  void read_header_rf_file(FILE *rf_file,int *w,int *h,int *n_frame) 
-  {
-    int *header=(int*)malloc(sizeof(int)*HEADER_SIZE);
-    fread(header,sizeof(int),HEADER_SIZE,rf_file);
-    *n_frame=header[1];
-    *w=header[2];
-    *h=header[3];
-    free(header);
-  }
 
   //=====================================================================
   RFImageReader::RFImageReader()
@@ -44,9 +35,9 @@ namespace creaImageIO
   {
     int *header=(int*)malloc(sizeof(int)*HEADER_SIZE);
     fread(header,sizeof(int),HEADER_SIZE,rf_file);
-    h.frame = header[1];
-    h.width = header[2];
-    h.height = header[3];
+    h.frame  = header[1];
+    h.height = header[2];
+    h.width = header[3];
     free(header);  
     return true;
   }
@@ -61,8 +52,8 @@ namespace creaImageIO
       {
 	rf_header h;
 	ok = ReadHeader(rf_file,h);
+	fclose(rf_file);
       }
-    fclose(rf_file);
     return ok;
   }
   //=====================================================================
@@ -70,6 +61,9 @@ namespace creaImageIO
   //=====================================================================
   vtkImageData* RFImageReader::ReadImage(const std::string& filename)
   {
+
+	  std::cout<<"RFImageReader reading "<<std::endl;
+
     FILE *rf_file=fopen(filename.c_str(),"rb");
     if (!rf_file) return false;
     rf_header h;
@@ -82,7 +76,7 @@ namespace creaImageIO
     long im_size = h.height * h.width * h.frame;
     short* data = (short*)malloc(sizeof(short)*im_size);
 
-    long frame_size = h.height * h.width * sizeof(short);
+    long frame_size = h.height * h.width;
     short* ptr = data;
     for (int k=0; k<h.frame; k++) {
       int frame_number;
@@ -92,13 +86,14 @@ namespace creaImageIO
     }
     fclose(rf_file);  
 
-    std::cout << "NewVtkImageDataFromRaw" << std::endl;
+    //    std::cout << "NewVtkImageDataFromRaw" << std::endl;
     vtkImageData* im = crea::NewVtkImageDataFromRaw( data,
 						     h.width,
 						     h.height,
 						     h.frame);
-    
-     std::cout << "OK" << std::endl;
+    return im;
+
+    //    std::cout << "OK" << std::endl;
     
   }
   //=====================================================================