X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOUltrasonixImageReader.cpp;h=99285c1725fea662175f7fdea988037dd8b250ce;hb=refs%2Fheads%2Fvtk8itk5wx3-macos;hp=978bb03ec4bd0d89c7134fce65e7c735aac1b485;hpb=bf3660569b1baa8be10fc708f595efc66afe3334;p=creaImageIO.git

diff --git a/src/creaImageIOUltrasonixImageReader.cpp b/src/creaImageIOUltrasonixImageReader.cpp
index 978bb03..99285c1 100644
--- a/src/creaImageIOUltrasonixImageReader.cpp
+++ b/src/creaImageIOUltrasonixImageReader.cpp
@@ -1,8 +1,41 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
+
 
 #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
@@ -55,7 +88,7 @@ namespace creaImageIO
   //=====================================================================
   bool UltrasonixImageReader::CanRead(const std::string& filename)
   { 
-    long size;
+    long size = -1;
     bool ok = false;
     FILE *Ultrasonix_file=fopen(filename.c_str(), "rb");
     if (Ultrasonix_file) 
@@ -77,7 +110,7 @@ namespace creaImageIO
 		size = (ftell(Ultrasonix_file) - HEADER_SIZE * sizeof(int)) / sizeof(int);
 
 	// check if the data size corresponds to the dimensions of the images
-	if (size == h.width * h.height * h.frame)
+	if (size == h.width * h.height * h.frame )
 		ok = true;
 
 	fclose(Ultrasonix_file);
@@ -132,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:
@@ -150,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:
@@ -168,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;
     }
 
@@ -234,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())