From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Tue, 16 Mar 2010 10:00:35 +0000 (+0000)
Subject: no message
X-Git-Tag: CREATOOLS.2-0-3~49
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=fc9f416364ea520257fac4163be2de826491fe60;p=creaImageIO.git

no message
---

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 3efdb19..0bf9bd4 100644
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -60,8 +60,18 @@ IF (WIN32)
   INSTALL( FILES ${PROJECT_SOURCE_DIR}/win32/sqlite3.h DESTINATION include/creaImageIO2 ) 
 ENDIF (WIN32)
 
- INSTALL( FILES ${PROJECT_SOURCE_DIR}/src2/data/localdatabase_Descriptor.dscp DESTINATION bin/Shared/gimmick )
+
+#-- data/gimmick --
+
+IF (WIN32)
+  SET(INSTALL_DATA_DIR "bin/share/gimmick")
+ELSE (WIN32)
+  SET(INSTALL_DATA_DIR "share/gimmick/")
+ENDIF (WIN32)
+INSTALL( FILES ${PROJECT_SOURCE_DIR}/src2/data/localdatabase_Descriptor.dscp DESTINATION ${INSTALL_DATA_DIR} )
  
+
+
 IF (BUILD_STANDALONE_INSTALLER)
 
   IF(WIN32)
diff --git a/src2/creaImageIOUltrasonixImageReader.cpp b/src2/creaImageIOUltrasonixImageReader.cpp
index dde3e4f..8eb476b 100644
--- a/src2/creaImageIOUltrasonixImageReader.cpp
+++ b/src2/creaImageIOUltrasonixImageReader.cpp
@@ -163,7 +163,7 @@ namespace creaImageIO
 
 		fclose(Ultrasonix_file);  
 
-	im = crea::NewVtkImageDataFromRaw( dataB32, h.width, h.height, h.frame);
+		im = crea::NewVtkImageDataFromRaw( dataB32, h.width, h.height, h.frame);
 	break;
     }