*** empty log message ***

diff --git a/src2/creaImageIOImageReader.cpp b/src2/creaImageIOImageReader.cpp
index 98e1341292b9173ee35b526ba4eaaa289378fe11..281af5f5848f40689b664bdb0b81ac5f00d73ca3 100644 (file)
--- 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 99f1e6c116ad770bb10631cc0adb05940c81da80..d80da229d10a142b1d7156940cd054417264cd4e 100644 (file)
--- 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 a207a4aa249927ab7ae5bc6b42ddad969b746b8c..b1f23318750a494ec367d082e9a6f262da40a075 100644 (file)
--- 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 f4a422e5f2c4c6c653eed6047b0c8cd5a4247491..4388f2e6df68565a7dcb49d4f16253b226f8cc6c 100644 (file)
--- 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 12c74402de2266a2019fa944abb451d6e4051aa3..41e76f375254a98251d2fd873cdfe58552c0e454 100644 (file)
--- 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;