From c8ff6165bb552b048528c4ac94844642ff8b198d Mon Sep 17 00:00:00 2001
From: maltaverne <maltaverne>
Date: Fri, 20 Mar 2009 08:41:43 +0000
Subject: [PATCH] *** empty log message ***

---
 src2/creaImageIOImageReader.cpp           | 1 +
 src2/creaImageIOImageReader.h             | 4 ++--
 src2/creaImageIORFImageReader.cpp         | 8 +++++---
 src2/creaImageIORFImageReader.h           | 4 ++--
 src2/creaImageIOUltrasonixImageReader.cpp | 5 +----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src2/creaImageIOImageReader.cpp b/src2/creaImageIOImageReader.cpp
index 98e1341..281af5f 100644
--- a/src2/creaImageIOImageReader.cpp
+++ b/src2/creaImageIOImageReader.cpp
@@ -155,6 +155,7 @@ namespace creaImageIO
 	i->ShallowCopy(mUnreadableImage);
       }
     //    std::cout << "i="<<i<<std::endl;
+std::cout<<"return: "<<i->GetScalarTypeAsString()<<", pointer="<<i<<std::endl;
     return i;
   }
   //=====================================================================
diff --git a/src2/creaImageIOImageReader.h b/src2/creaImageIOImageReader.h
index 99f1e6c..d80da22 100644
--- a/src2/creaImageIOImageReader.h
+++ b/src2/creaImageIOImageReader.h
@@ -1,13 +1,13 @@
 #ifndef __creaImageIOImageReader_h_INCLUDED__
 #define __creaImageIOImageReader_h_INCLUDED__
 
-#include <creaImageIOAbstractImageReader.h>
 #include <creaImageIOSystem.h>
+#include <creaImageIOAbstractImageReader.h>
 
 namespace creaImageIO
 {
 
-
+ 
   /**
    * \ingroup IO
    * \brief Generic image reader which uses all the specific concrete image reader of the lib (tif, jpg, dicom, ...)
diff --git a/src2/creaImageIORFImageReader.cpp b/src2/creaImageIORFImageReader.cpp
index a207a4a..b1f2331 100644
--- a/src2/creaImageIORFImageReader.cpp
+++ b/src2/creaImageIORFImageReader.cpp
@@ -37,7 +37,7 @@ namespace creaImageIO
     fread(header,sizeof(int),HEADER_SIZE,rf_file);
     h.frame  = header[1];
     h.height = header[2];
-    h.width  = header[3];
+    h.width = header[3];
     free(header);  
     return true;
   }
@@ -61,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;
@@ -73,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;
@@ -88,7 +91,6 @@ namespace creaImageIO
 						     h.width,
 						     h.height,
 						     h.frame);
-    
     return im;
 
     //    std::cout << "OK" << std::endl;
diff --git a/src2/creaImageIORFImageReader.h b/src2/creaImageIORFImageReader.h
index f4a422e..4388f2e 100644
--- a/src2/creaImageIORFImageReader.h
+++ b/src2/creaImageIORFImageReader.h
@@ -3,7 +3,7 @@
 
 
 #include <creaImageIOAbstractImageReader.h>
-
+#include <creaImageIOSystem.h>
 
 namespace creaImageIO
 {
@@ -15,7 +15,7 @@ namespace creaImageIO
   
   //=====================================================================
   /// Concrete image reader for ultrasonix 'rf' files
-  class RFImageReader : virtual public AbstractImageReader
+  class CREAIMAGEIO_EXPORT RFImageReader : virtual public AbstractImageReader
   {
   public:
     RFImageReader();
diff --git a/src2/creaImageIOUltrasonixImageReader.cpp b/src2/creaImageIOUltrasonixImageReader.cpp
index 12c7440..41e76f3 100644
--- a/src2/creaImageIOUltrasonixImageReader.cpp
+++ b/src2/creaImageIOUltrasonixImageReader.cpp
@@ -1,7 +1,7 @@
 
+#include <creaImageIOSystem.h>
 #include <creaImageIOUltrasonixImageReader.h>
 #include <creaVtk.h>
-#include <creaImageIOSystem.h>
 #include "boost/filesystem/path.hpp"
 
 namespace creaImageIO
@@ -82,9 +82,6 @@ namespace creaImageIO
   //=====================================================================
   vtkImageData* UltrasonixImageReader::ReadImage(const std::string& filename)
   {
-
-	  std::cout<<"UltrasonixImageReader reading "<<std::endl;
-
     FILE *Ultrasonix_file=fopen(filename.c_str(),"rb");
     if (!Ultrasonix_file) return false;
     Ultrasonix_header h;
-- 
2.45.2