Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index f06ae75715beb2a34dfa4d25d573dc43bc90db73..7145cb20e85afa7bbd14865d25aa07fe24819c2e 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -233,7 +233,7 @@ IF (CLITK_BUILD_TOOLS)
   IF(CLITK_EXPERIMENTAL)
     WRAP_GGO(clitkBinaryImageToMesh_GGO_C clitkBinaryImageToMesh.ggo)
     ADD_EXECUTABLE(clitkBinaryImageToMesh clitkBinaryImageToMesh.cxx ${clitkBinaryImageToMesh_GGO_C})
-    TARGET_LINK_LIBRARIES(clitkBinaryImageToMesh ${ITK_LIBRARIES} ${VTK_LIBRARIES})
+    TARGET_LINK_LIBRARIES(clitkBinaryImageToMesh itksys ${VTK_LIBRARIES})
     SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkBinaryImageToMesh)
 
     WRAP_GGO(clitkMeshToBinaryImage_GGO_C clitkMeshToBinaryImage.ggo)

diff --git a/tools/clitkBinaryImageToMesh.cxx b/tools/clitkBinaryImageToMesh.cxx
index 463fa454eefc85a499961d443ca65f8a783af5ac..4e00f7e7dd0e42e8d745755aadb1b6fd9d031be3 100644 (file)
--- a/tools/clitkBinaryImageToMesh.cxx
+++ b/tools/clitkBinaryImageToMesh.cxx
@@ -16,7 +16,7 @@
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
 ===========================================================================*/
 #include "clitkBinaryImageToMesh_ggo.h"
-#include "clitkImageToImageGenericFilter.h"
+#include "clitkCommon.h"
 
 #include "vtkMetaImageReader.h"
 #include "vtkContourFilter.h"

diff --git a/vv/vvMeshReader.cxx b/vv/vvMeshReader.cxx
index 1da14a15b4e6eabd5f9eed4e1d307917b9b05273..040ba50142526d6ae2f5939949b8fb3e69626162 100644 (file)
--- a/vv/vvMeshReader.cxx
+++ b/vv/vvMeshReader.cxx
@@ -162,9 +162,9 @@ std::vector<vvMesh::Pointer> vvMeshReader::readSelectedContours()
       gdcm::Attribute<0x3006,0x2a> trgb;
       trgb.SetFromDataSet(ds_rois);
       vvMesh::Pointer current_roi=vvMesh::New();
-      current_roi->r = trgb[0] / 255;
-      current_roi->g = trgb[1] / 255;
-      current_roi->b = trgb[2] / 255;
+      current_roi->r = trgb[0] / 255.0;
+      current_roi->g = trgb[1] / 255.0;
+      current_roi->b = trgb[2] / 255.0;
 
       gdcm::Attribute<0x3006,0x26> tstructure_name;
       tstructure_name.SetFromDataSet(ds_roi_info);