X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOUltrasonixImageReader.cpp;h=99285c1725fea662175f7fdea988037dd8b250ce;hb=efe10f4ac0d8de45d26ca7b1f74f3676802c1b90;hp=d5f6c655240da2f5f2b00acd13961719673bc324;hpb=c7482ec7d04a5e5987841932a6856ebd471cebdb;p=creaImageIO.git

diff --git a/src/creaImageIOUltrasonixImageReader.cpp b/src/creaImageIOUltrasonixImageReader.cpp
index d5f6c65..99285c1 100644
--- a/src/creaImageIOUltrasonixImageReader.cpp
+++ b/src/creaImageIOUltrasonixImageReader.cpp
@@ -28,8 +28,14 @@
 
 #include "creaImageIOSystem.h"
 #include "creaImageIOUltrasonixImageReader.h"
+
 #include <creaVtk.h>
 #include <boost/filesystem/path.hpp>
+
+#if defined(_WIN32)
+#pragma warning(disable: 4996)
+#endif
+
 namespace creaImageIO
 {
 #define HEADER_SIZE	19
@@ -159,7 +165,7 @@ namespace creaImageIO
 		}
 		fclose(Ultrasonix_file);  
 
-		im = crea::NewVtkImageDataFromRaw( dataRF, h.width, h.height, h.frame);
+		im = crea::NewVtkImageDataFromRaw<short>( dataRF, h.width, h.height, h.frame);
 	break;
 
 	case TYPE_B8:
@@ -177,7 +183,7 @@ namespace creaImageIO
 
 		fclose(Ultrasonix_file);  
 
-	im = crea::NewVtkImageDataFromRaw( dataB8, h.width, h.height, h.frame);
+		im = crea::NewVtkImageDataFromRaw<char>( dataB8, h.width, h.height, h.frame);
 	break;
 
 	case TYPE_B32:
@@ -195,7 +201,7 @@ namespace creaImageIO
 
 		fclose(Ultrasonix_file);  
 
-		im = crea::NewVtkImageDataFromRaw( dataB32, h.width, h.height, h.frame);
+		im = crea::NewVtkImageDataFromRaw<int>( dataB32, h.width, h.height, h.frame);
 	break;
     }
 
@@ -261,7 +267,7 @@ namespace creaImageIO
     if ( (i = attr.find("D0004_1500")) != attr.end())
     {
 	   boost::filesystem::path full_path(filename);
-	   std::string f = full_path.leaf();
+	   std::string f = full_path.leaf().string();
 	   i->second = f;
     }
     if ( (i = attr.find("D0028_0010")) != attr.end())