diff --git a/README.md b/README.md index 336793a802..3000aed62f 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,10 @@ Ubuntu 18.04, 20.04, 22.04 (amd64)| [![ubuntu dep apt workflow](https://github.c macOS 11 and 12 | [![macos workflow](https://github.com/lagadic/visp/actions/workflows/macos.yml/badge.svg)](https://github.com/lagadic/visp/actions/workflows/macos.yml) iOS on macOS 11.0| [![ios workflow](https://github.com/lagadic/visp/actions/workflows/ios.yml/badge.svg)](https://github.com/lagadic/visp/actions/workflows/ios.yml) Windows 10 | [![Build status](https://ci.appveyor.com/api/projects/status/121dscdkryf5dbn0/branch/master?svg=true)](https://ci.appveyor.com/project/fspindle/visp/branch/master) -Other arch Ubuntu 20.04 (aarch64, s390x)| [![other arch workflow](https://github.com/lagadic/visp/actions/workflows/other-arch.yml/badge.svg)](https://github.com/lagadic/visp/actions/workflows/other-arch.yml) -ROS Melodic Ubuntu 18.04 Bionic | [![Build Status](https://build.ros.org/buildStatus/icon?job=Mdev__visp__ubuntu_bionic_amd64)](https://build.ros.org/job/Mdev__visp__ubuntu_bionic_amd64) -ROS Noetic Ubuntu 20.04 Focal | [![Build Status](https://build.ros.org/buildStatus/icon?job=Ndev__visp__ubuntu_focal_amd64)](https://build.ros.org/job/Ndev__visp__ubuntu_focal_amd64/) -ROS2 Foxy Ubuntu 20.04 Focal| [![Build Status](https://build.ros2.org/buildStatus/icon?job=Fdev__visp__ubuntu_focal_amd64)](https://build.ros2.org/job/Fdev__visp__ubuntu_focal_amd64/) +Other arch Ubuntu 22.04 (aarch64, s390x)| [![other arch workflow](https://github.com/lagadic/visp/actions/workflows/other-arch.yml/badge.svg)](https://github.com/lagadic/visp/actions/workflows/other-arch.yml) +ROS1 Noetic Ubuntu 20.04 Focal | [![Build Status](https://build.ros.org/buildStatus/icon?job=Ndev__visp__ubuntu_focal_amd64)](https://build.ros.org/job/Ndev__visp__ubuntu_focal_amd64/) ROS2 Humble Ubuntu 22.04 Jammy| [![Build Status](https://build.ros2.org/buildStatus/icon?job=Hdev__visp__ubuntu_jammy_amd64)](https://build.ros2.org/job/Hdev__visp__ubuntu_jammy_amd64/) +ROS2 Iron Ubuntu 22.04 Jammy| [![Build Status](https://build.ros2.org/buildStatus/icon?job=Idev__visp__ubuntu_jammy_amd64)](https://build.ros2.org/job/Idev__visp__ubuntu_jammy_amd64/) ROS2 Rolling Ubuntu 22.04 Jammy| [![Build Status](https://build.ros2.org/buildStatus/icon?job=Rdev__visp__ubuntu_jammy_amd64)](https://build.ros2.org/job/Rdev__visp__ubuntu_jammy_amd64) Valgrind | [![valgrind workflow](https://github.com/lagadic/visp/actions/workflows/valgrind.yml/badge.svg)](https://github.com/lagadic/visp/actions/workflows/valgrind.yml) Sanitizer | [![sanitizers workflow](https://github.com/lagadic/visp/actions/workflows/ubuntu-sanitizers.yml/badge.svg)](https://github.com/lagadic/visp/actions/workflows/ubuntu-sanitizers.yml) diff --git a/cmake/VISPModule.cmake b/cmake/VISPModule.cmake index a178dc79f3..3e44846b6f 100644 --- a/cmake/VISPModule.cmake +++ b/cmake/VISPModule.cmake @@ -805,10 +805,10 @@ macro(_vp_create_module) ${VISP_MODULE_${the_module}_DEPS_TO_LINK} ${VISP_MODULE_${the_module}_DEPS_EXT} ${VISP_MODULE_${the_module}_LINK_DEPS} - ${VISP_LINKER_LIBS} LINK_PRIVATE ${VISP_MODULE_${the_module}_PRIVATE_REQ_DEPS} - ${VISP_MODULE_${the_module}_PRIVATE_OPT_DEPS}) + ${VISP_MODULE_${the_module}_PRIVATE_OPT_DEPS} + ${VISP_LINKER_LIBS}) add_dependencies(visp_modules ${the_module}) if(ENABLE_SOLUTION_FOLDERS) diff --git a/modules/tracker/me/src/moving-edges/vpMeNurbs.cpp b/modules/tracker/me/src/moving-edges/vpMeNurbs.cpp index f7cc1bf39d..4bfacc7737 100644 --- a/modules/tracker/me/src/moving-edges/vpMeNurbs.cpp +++ b/modules/tracker/me/src/moving-edges/vpMeNurbs.cpp @@ -593,7 +593,7 @@ void vpMeNurbs::seekExtremitiesCanny(const vpImage &I) std::list::iterator itList = list.begin(); double convlt; double delta = 0; - int nbr = 0; + unsigned int nbr = 0; std::list addedPt; for (std::list::const_iterator itEdges = ip_edges_list.begin(); itEdges != ip_edges_list.end(); ++itEdges) { @@ -625,7 +625,7 @@ void vpMeNurbs::seekExtremitiesCanny(const vpImage &I) unsigned int memory_range = me->getRange(); me->setRange(3); std::list::iterator itList2 = list.begin(); - for (int j = 0; j < nbr; j++) { + for (unsigned int j = 0; j < nbr; j++) { vpMeSite s = *itList2; s.track(I, me, false); *itList2 = s; @@ -724,7 +724,7 @@ void vpMeNurbs::seekExtremitiesCanny(const vpImage &I) --itList; // Move on the last element double convlt; double delta; - int nbr = 0; + unsigned int nbr = 0; std::list addedPt; for (std::list::const_iterator itEdges = ip_edges_list.begin(); itEdges != ip_edges_list.end(); ++itEdges) { @@ -755,7 +755,7 @@ void vpMeNurbs::seekExtremitiesCanny(const vpImage &I) me->setRange(3); std::list::iterator itList2 = list.end(); --itList2; // Move to the last element - for (int j = 0; j < nbr; j++) { + for (unsigned int j = 0; j < nbr; j++) { vpMeSite me_s = *itList2; me_s.track(I, me, false); *itList2 = me_s; diff --git a/tutorial/imgproc/hough-transform/CMakeLists.txt b/tutorial/imgproc/hough-transform/CMakeLists.txt index 710487c12e..2fd83346bc 100644 --- a/tutorial/imgproc/hough-transform/CMakeLists.txt +++ b/tutorial/imgproc/hough-transform/CMakeLists.txt @@ -1,6 +1,6 @@ project(tutorial-hough) -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) find_package(VISP REQUIRED visp_core visp_gui visp_imgproc)