no message

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index 3efdb195f0be0358da54b4c7846f4840a0687a37..0bf9bd4b0def44798ddfc9da5902db8e6aa0c363 100644 (file)
--- 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 dde3e4f2655db5867c10d037db6b6ec37ab7f01c..8eb476bbb8605bbaea8eb3a75cc396a1e351a06b 100644 (file)
--- 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;
     }