Merge branch 'master' of cgogn:CGoGN

CMakeLists.txt

@@ -27,7 +27,7 @@ IF(WIN32)
 ENDIF(WIN32)
 
 find_package(OpenGL REQUIRED)
-find_package(Boost COMPONENTS regex thread REQUIRED)
+find_package(Boost COMPONENTS regex thread system REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(LibXml2 REQUIRED)
 find_package(GLEW REQUIRED)
@@ -82,6 +82,7 @@ SET (CGoGN_EXT_LIBS
 	${GLEW_LIBRARIES}
 	${ZLIB_LIBRARIES}
 	${LIBXML2_LIBRARIES}
+	${Boost_SYSTEM_LIBRARY}
 	${Boost_REGEX_LIBRARY}
 	${Boost_THREAD_LIBRARY} )
 

apps_cmake.txt

@@ -34,7 +34,7 @@ ENDIF(WIN32)
 
 
 find_package(OpenGL REQUIRED)
-find_package(Boost COMPONENTS regex thread REQUIRED)
+find_package(Boost COMPONENTS regex thread system REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(LibXml2 REQUIRED)
 find_package(GLEW REQUIRED)
@@ -65,6 +65,7 @@ SET (COMMON_LIBS
 	${GLEW_LIBRARIES}
 	${ZLIB_LIBRARIES}
 	${LIBXML2_LIBRARIES}
+	${Boost_SYSTEM_LIBRARY}
 	${Boost_REGEX_LIBRARY}
 	${Boost_THREAD_LIBRARY} )
 

include/Geometry/distances.hpp

@@ -239,7 +239,7 @@ typename VEC3::DATA_TYPE squaredDistanceLine2Seg(const VEC3& A, const VEC3& AB,
 }
 
 template <typename VEC3>
-float squaredDistanceSeg2Point(const VEC3& A, const VEC3& AB, typename VEC3::DATA_TYPE AB2, const VEC3& P)
+typename VEC3::DATA_TYPE squaredDistanceSeg2Point(const VEC3& A, const VEC3& AB, typename VEC3::DATA_TYPE AB2, const VEC3& P)
 {
 	typedef typename VEC3::DATA_TYPE T ;