From 87f544ebd262834c211a16a6102bf87bfd5fc7cd Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Wed, 3 Jul 2024 09:57:42 +0200 Subject: [PATCH 01/11] Fix GNSS name typo --- 3rdparty/xspublic/xstypes/xsstatusflag.h | 2 +- libs/hwdrivers/include/mrpt/hwdrivers/CGPSInterface.h | 2 +- libs/obs/include/mrpt/obs/CObservationGPS.h | 2 +- share/mrpt/config_files/rawlog-grabber/gps.ini | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty/xspublic/xstypes/xsstatusflag.h b/3rdparty/xspublic/xstypes/xsstatusflag.h index 6f077c0019..bfdd324553 100644 --- a/3rdparty/xspublic/xstypes/xsstatusflag.h +++ b/3rdparty/xspublic/xstypes/xsstatusflag.h @@ -57,7 +57,7 @@ enum XsStatusFlag ,XSF_RepresentativeMotion = 0x20 //!< Indicates if the In-Run Compass Calibration is doing the representative motion analysis - ,XSF_ExternalClockSynced = 0x40 //!< Indicates whether the internal clock is synced with an external clock (Either GNNS or custom provided clock sync) + ,XSF_ExternalClockSynced = 0x40 //!< Indicates whether the internal clock is synced with an external clock (Either GNSS or custom provided clock sync) ,XSF_ClipAccX = 0x00000100 ,XSF_ClipAccY = 0x00000200 diff --git a/libs/hwdrivers/include/mrpt/hwdrivers/CGPSInterface.h b/libs/hwdrivers/include/mrpt/hwdrivers/CGPSInterface.h index 82a3869359..c2438466c1 100644 --- a/libs/hwdrivers/include/mrpt/hwdrivers/CGPSInterface.h +++ b/libs/hwdrivers/include/mrpt/hwdrivers/CGPSInterface.h @@ -64,7 +64,7 @@ namespace mrpt::hwdrivers * baudRate = 4800 // The baudrate of the communications (typ. 4800 or * 9600 bauds) * - * # (Default:true) Whether to append the GNNS message type to CObservation + * # (Default:true) Whether to append the GNSS message type to CObservation * `sensorLabel` field * sensor_label_append_msg_type = true * diff --git a/libs/obs/include/mrpt/obs/CObservationGPS.h b/libs/obs/include/mrpt/obs/CObservationGPS.h index 8c99c3c914..3fd6a1ff9f 100644 --- a/libs/obs/include/mrpt/obs/CObservationGPS.h +++ b/libs/obs/include/mrpt/obs/CObservationGPS.h @@ -87,7 +87,7 @@ class CObservationGPS : public CObservation * based on the local computer clock. */ bool has_satellite_timestamp{false}; - /** The main piece of data in this class: a list of GNNS messages. + /** The main piece of data in this class: a list of GNSS messages. * Normally users might prefer to access the list via the methods * CObservationGPS::getMsgByClass() and CObservationGPS::setMsg() * Typically only one message, may be multiple if all have the same diff --git a/share/mrpt/config_files/rawlog-grabber/gps.ini b/share/mrpt/config_files/rawlog-grabber/gps.ini index c68fd0a3da..43def8a530 100644 --- a/share/mrpt/config_files/rawlog-grabber/gps.ini +++ b/share/mrpt/config_files/rawlog-grabber/gps.ini @@ -43,7 +43,7 @@ COM_port_WIN = COM1 COM_port_LIN = ttyUSB0 baudRate = 4800 // The baudrate of the communications (typ. 4800 or 9600 bauds) -# (Default:true) Whether to append the GNNS message type to CObservation `sensorLabel` field +# (Default:true) Whether to append the GNSS message type to CObservation `sensorLabel` field sensor_label_append_msg_type = true # Select a parser for GNSS data: From 50e30c99998a64ba37153e6f9c3f0e625009be21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 00:28:04 +0000 Subject: [PATCH 02/11] Bump certifi from 2023.7.22 to 2024.7.4 in /doc Bumps [certifi](https://github.com/certifi/python-certifi) from 2023.7.22 to 2024.7.4. - [Commits](https://github.com/certifi/python-certifi/compare/2023.07.22...2024.07.04) --- updated-dependencies: - dependency-name: certifi dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- doc/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/requirements.txt b/doc/requirements.txt index e3d33730ea..712fda333f 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,6 +1,6 @@ alabaster==0.7.13 Babel==2.12.1 -certifi==2023.7.22 +certifi==2024.7.4 charset-normalizer==3.2.0 docutils==0.17.1 idna==3.7 From 2644592d456733afe3d0c1bb415746de8b9635bd Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Thu, 11 Jul 2024 12:05:02 +0200 Subject: [PATCH 03/11] patch version bump --- appveyor.yml | 2 +- package.xml | 2 +- version_prefix.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a1b409dcaf..f9e9e2be69 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ # version format -version: 2.13.3-{branch}-build{build} +version: 2.13.4-{branch}-build{build} os: Visual Studio 2019 diff --git a/package.xml b/package.xml index 00ecf3e6d9..dc51eede11 100644 --- a/package.xml +++ b/package.xml @@ -7,7 +7,7 @@ mrpt2 - 2.13.3 + 2.13.4 Mobile Robot Programming Toolkit (MRPT) version 2.x Jose-Luis Blanco-Claraco diff --git a/version_prefix.txt b/version_prefix.txt index 19e34f9c68..587123128d 100644 --- a/version_prefix.txt +++ b/version_prefix.txt @@ -1,4 +1,4 @@ -2.13.3 +2.13.4 # IMPORTANT: This file is parsed by CMake, don't add any comment to # the first line. # This file is used in both Windows and Linux scripts to automatically From 407bdfa33da050daae2b6ecf713f84462bda4f5b Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Thu, 11 Jul 2024 12:05:40 +0200 Subject: [PATCH 04/11] update nanoflann version --- 3rdparty/nanoflann | 2 +- doc/source/doxygen-docs/changelog.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/3rdparty/nanoflann b/3rdparty/nanoflann index 37b31cb554..a74fc3b5b3 160000 --- a/3rdparty/nanoflann +++ b/3rdparty/nanoflann @@ -1 +1 @@ -Subproject commit 37b31cb554688a51a1f773420aa1b2c94c99237b +Subproject commit a74fc3b5b359c941d9a00eb9d92c2202c22eca3a diff --git a/doc/source/doxygen-docs/changelog.md b/doc/source/doxygen-docs/changelog.md index 0944f36c3a..b511189701 100644 --- a/doc/source/doxygen-docs/changelog.md +++ b/doc/source/doxygen-docs/changelog.md @@ -1,5 +1,9 @@ \page changelog Change Log +# Version 2.13.4: Released July 11th, 2024 +- Fix docs typos. +- Upgraded nanoflann to v1.6.0 (fixes an important bug). + # Version 2.13.3: Released July 1st, 2024 - Build system: - ROS package.xml: Re-enable the octomap dependency From 2bb3182950046417c36068c2e2ff5bc53c1cd054 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Thu, 11 Jul 2024 16:50:09 +0200 Subject: [PATCH 05/11] wxWidgets: fix usage of deprecated symbols --- apps/camera-calib/camera_calib_guiMain.cpp | 4 ++-- apps/ptg-configurator/ptgConfiguratorMain.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/camera-calib/camera_calib_guiMain.cpp b/apps/camera-calib/camera_calib_guiMain.cpp index 19eb69841b..8c2af6ac6b 100644 --- a/apps/camera-calib/camera_calib_guiMain.cpp +++ b/apps/camera-calib/camera_calib_guiMain.cpp @@ -166,7 +166,7 @@ camera_calib_guiDialog::camera_calib_guiDialog(wxWindow* parent, wxWindowID id) btnCaptureNow = new wxButton( this, ID_BUTTON8, _("Grab now..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON8")); - wxFont btnCaptureNowFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxBOLD); + wxFont btnCaptureNowFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD); btnCaptureNow->SetFont(btnCaptureNowFont); FlexGridSizer5->Add(btnCaptureNow, 1, wxEXPAND, 5); btnPoseEstimateNow = new wxButton( @@ -301,7 +301,7 @@ camera_calib_guiDialog::camera_calib_guiDialog(wxWindow* parent, wxWindowID id) this, ID_BUTTON3, _("Calibrate"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON3")); btnRunCalib->SetDefault(); - wxFont btnRunCalibFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxBOLD); + wxFont btnRunCalibFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD); btnRunCalib->SetFont(btnRunCalibFont); FlexGridSizer8->Add(btnRunCalib, 1, wxEXPAND, 5); btnSave = new wxButton( diff --git a/apps/ptg-configurator/ptgConfiguratorMain.cpp b/apps/ptg-configurator/ptgConfiguratorMain.cpp index 6493d1c72a..b18438440a 100644 --- a/apps/ptg-configurator/ptgConfiguratorMain.cpp +++ b/apps/ptg-configurator/ptgConfiguratorMain.cpp @@ -206,7 +206,7 @@ ptgConfiguratorframe::ptgConfiguratorframe(wxWindow* parent, wxWindowID id) : btnReloadParams = new wxButton( Panel1, ID_BUTTON1, _("Initialize PTG"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_BUTTON1")); - wxFont btnReloadParamsFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxBOLD); + wxFont btnReloadParamsFont(-1, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD); btnReloadParams->SetFont(btnReloadParamsFont); FlexGridSizer7->Add( btnReloadParams, 1, wxALL | wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL, 5); From 75f2916353f88c4a108cac432cf2901af3ff7675 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Fri, 12 Jul 2024 22:31:51 +0200 Subject: [PATCH 06/11] nanogui: fix cmake deprecated warning --- 3rdparty/nanogui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/nanogui b/3rdparty/nanogui index f1b84bae40..46c9c08687 160000 --- a/3rdparty/nanogui +++ b/3rdparty/nanogui @@ -1 +1 @@ -Subproject commit f1b84bae40b306e914d1492d4c61107b5bb1a539 +Subproject commit 46c9c08687d73711dc547f975a1aefccc5ced621 From c3878830423d57a17b9a9668405e3158822060fe Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Fri, 12 Jul 2024 22:33:22 +0200 Subject: [PATCH 07/11] remove obsolete FindOpenCV.cmake module --- cmakemodules/FindOpenCV.cmake | 360 ---------------------------------- 1 file changed, 360 deletions(-) delete mode 100644 cmakemodules/FindOpenCV.cmake diff --git a/cmakemodules/FindOpenCV.cmake b/cmakemodules/FindOpenCV.cmake deleted file mode 100644 index 1677d8ed8b..0000000000 --- a/cmakemodules/FindOpenCV.cmake +++ /dev/null @@ -1,360 +0,0 @@ -# - Try to find OpenCV library installation -# See http://sourceforge.net/projects/opencvlibrary/ -# -# The follwoing variables are optionally searched for defaults -# OpenCV_ROOT_DIR: Base directory of OpenCv tree to use. -# OpenCV_FIND_REQUIRED_COMPONENTS : find_package(OpenCV COMPONENTS ..) -# compatible interface. typically CV CXCORE CVAUX HIGHGUI CVCAM .. etc. -# -# The following are set after configuration is done: -# OpenCV_FOUND -# OpenCV_INCLUDE_DIR -# OpenCV_LIBRARIES -# OpenCV_LINK_DIRECTORIES -# -# deprecated: -# OPENCV_* uppercase replaced by case sensitive OpenCV_* -# OPENCV_EXE_LINKER_FLAGS -# OPENCV_INCLUDE_DIR : replaced by plural *_DIRS -# -# 2004/05 Jan Woetzel, Friso, Daniel Grest -# 2006/01 complete rewrite by Jan Woetzel -# 1006/09 2nd rewrite introducing ROOT_DIR and PATH_SUFFIXES -# to handle multiple installed versions gracefully by Jan Woetzel -# -# tested with: -# -OpenCV 0.97 (beta5a): MSVS 7.1, gcc 3.3, gcc 4.1 -# -OpenCV 0.99 (1.0rc1): MSVS 7.1, MSVS 8.0 -# -# 20 Nov 2008: Changes by Jose Luis Blanco Claraco -# - Updated for finding OpenCV1.1.0-pre under Windows in the system -# registry (It can be installed along 1.0.0 without problems) -# - Finds and uses debug libraries and DLLs (Windows). -# -# www.mip.informatik.uni-kiel.de/~jw -# -------------------------------- - -# NOTES -# NO_CMAKE_SYSTEM_PATH is required to bypass searching in CMAKE_SYSTEM_LIBRARY_PATH -# because it defaults to $ENV{ProgramFiles} in WindowsPaths.cmake -# which corrupts the order of BIAS_EXTERN_LIBS (JW 02/2007) - - -macro(DBG_MSG _MSG) - #message(STATUS "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}):\n${_MSG}") -endmacro(DBG_MSG) - - - -# required cv components with header and library if COMPONENTS unspecified -if (NOT OpenCV_FIND_COMPONENTS) - # default - set(OpenCV_FIND_REQUIRED_COMPONENTS CV CXCORE CVAUX HIGHGUI ) - if (WIN32) -# list(APPEND OpenCV_FIND_REQUIRED_COMPONENTS CVCAM ) # WIN32 only actually - endif(WIN32) -endif (NOT OpenCV_FIND_COMPONENTS) - - -# typical root dirs of installations, exactly one of them is used -set (OpenCV_POSSIBLE_ROOT_DIRS - "${OpenCV_ROOT_DIR}" - "$ENV{OpenCV_ROOT_DIR}" - "$ENV{OPENCV_DIR}" # only for backward compatibility deprecated by ROOT_DIR - "$ENV{OPENCV_HOME}" # only for backward compatibility - "$ENV{EXTERN_LIBS_DIR}/OpenCV" # central precompiled libs - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Open Source Computer Vision Library_is1;Inno Setup: App Path]" # works with OpenCV 1.1.0pre - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Intel(R) Open Source Computer Vision Library_is1;Inno Setup: App Path]" # works with OpenCV beta5a - "$ENV{ProgramFiles}/OpenCV" - "$ENV{ProgramFiles}/OpenCV_10rc1" - /usr/local - /usr - ) - - -# MIP Uni Kiel /opt/net network installation -# get correct prefix for current gcc compiler version for gcc 3.x 4.x -if (${CMAKE_COMPILER_IS_GNUCXX}) - if (NOT OpenCV_FIND_QUIETLY) - message(STATUS "Checking GNUCXX version 3/4 to determine OpenCV /opt/net/ path") - endif (NOT OpenCV_FIND_QUIETLY) - exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE CXX_COMPILER_VERSION) - if (CXX_COMPILER_VERSION MATCHES ".*3\\.[0-9].*") - set(IS_GNUCXX3 TRUE) - list(APPEND OpenCV_POSSIBLE_ROOT_DIRS /opt/net/gcc33/OpenCV ) - endif(CXX_COMPILER_VERSION MATCHES ".*3\\.[0-9].*") - if (CXX_COMPILER_VERSION MATCHES ".*4\\.[0-1].*") - set(IS_GNUCXX4 TRUE) - list(APPEND OpenCV_POSSIBLE_ROOT_DIRS /opt/net/gcc41/OpenCV ) - endif(CXX_COMPILER_VERSION MATCHES ".*4\\.[0-1].*") - #SuSE 10.3, gcc4.2.1 needs OpenCV-1.0.0 - if (CXX_COMPILER_VERSION MATCHES ".*4\\.[2-9].*") - set(IS_GNUCXX4 TRUE) - list(APPEND OpenCV_POSSIBLE_ROOT_DIRS /opt/net/gcc41/OpenCV-1.0.0) - endif(CXX_COMPILER_VERSION MATCHES ".*4\\.[2-9].*") -endif (${CMAKE_COMPILER_IS_GNUCXX}) - -#DBG_MSG("OpenCV_POSSIBLE_ROOT_DIRS=${OpenCV_POSSIBLE_ROOT_DIRS}") - -# -# select exactly ONE OpenCV base directory/tree -# to avoid mixing different version headers and libs -# -find_path(OpenCV_ROOT_DIR - NAMES - cv/include/cv.h # windows - include/opencv/cv.h # linux /opt/net - include/cv/cv.h - include/cv.h - PATHS ${OpenCV_POSSIBLE_ROOT_DIRS}) -DBG_MSG("OpenCV_ROOT_DIR=${OpenCV_ROOT_DIR}") - - -# header include dir suffixes appended to OpenCV_ROOT_DIR -set(OpenCV_INCDIR_SUFFIXES - include - include/cv - include/opencv - cv/include - cxcore/include - cvaux/include - 3rdparty/cvcam/include - 3rdparty/highgui - 3rdparty/highgui/include - 3rdparty/_graphics/include - ) -DBG_MSG("OpenCV_INCDIR_SUFFIXES=${OpenCV_INCDIR_SUFFIXES}") - -# library linkdir suffixes appended to OpenCV_ROOT_DIR -set(OpenCV_LIBDIR_SUFFIXES - lib - OpenCV/lib - 3rdparty/_graphics/lib - ) -DBG_MSG("OpenCV_LIBDIR_SUFFIXES=${OpenCV_LIBDIR_SUFFIXES}") - - -# -# find incdir for each lib -# -find_path(OpenCV_CV_INCLUDE_DIR - NAMES cv.h - PATHS ${OpenCV_ROOT_DIR} - PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CV_INCLUDE_DIR=${OpenCV_CV_INCLUDE_DIR}") -find_path(OpenCV_CXCORE_INCLUDE_DIR - NAMES cxcore.h - PATHS ${OpenCV_ROOT_DIR} - PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CXCORE_INCLUDE_DIR=${OpenCV_CXCORE_INCLUDE_DIR}") -find_path(OpenCV_CVAUX_INCLUDE_DIR - NAMES cvaux.h - PATHS ${OpenCV_ROOT_DIR} - PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CVAUX_INCLUDE_DIR=${OpenCV_CVAUX_INCLUDE_DIR}") -find_path(OpenCV_HIGHGUI_INCLUDE_DIR - NAMES highgui.h - PATHS ${OpenCV_ROOT_DIR} - PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_HIGHGUI_INCLUDE_DIR=${OpenCV_HIGHGUI_INCLUDE_DIR}") -find_path(OpenCV_CVCAM_INCLUDE_DIR - NAMES cvcam.h - PATHS ${OpenCV_ROOT_DIR} - PATH_SUFFIXES ${OpenCV_INCDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CVCAM_INCLUDE_DIR=${OpenCV_CVCAM_INCLUDE_DIR}") - -# -# find sbsolute path to all libraries -# some are optionally, some may not exist on Linux -# -find_library(OpenCV_CV_LIBRARY - NAMES cv opencv cv0.9.7 - PATHS ${OpenCV_ROOT_DIR} - PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CV_LIBRARY=${OpenCV_CV_LIBRARY}") -find_library(OpenCV_CVAUX_LIBRARY - NAMES cvaux cvaux0.9.7 - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CVAUX_LIBRARY=${OpenCV_CVAUX_LIBRARY}") -find_library(OpenCV_CVCAM_LIBRARY - NAMES cvcam - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CVCAM_LIBRARY=${OpenCV_CVCAM_LIBRARY}") -find_library(OpenCV_CVHAARTRAINING_LIBRARY - NAMES cvhaartraining - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CVHAARTRAINING_LIBRARY=${OpenCV_CVHAARTRAINING_LIBRARY}") -find_library(OpenCV_CXCORE_LIBRARY - NAMES cxcore cxcore0.9.7 - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CXCORE_LIBRARY=${OpenCV_CXCORE_LIBRARY}") -find_library(OpenCV_CXTS_LIBRARY - NAMES cxts - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CXTS_LIBRARY=${OpenCV_CXTS_LIBRARY}") -find_library(OpenCV_HIGHGUI_LIBRARY - NAMES highgui highgui0.9.7 - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_HIGHGUI_LIBRARY=${OpenCV_HIGHGUI_LIBRARY}") -find_library(OpenCV_ML_LIBRARY - NAMES ml - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_ML_LIBRARY=${OpenCV_ML_LIBRARY}") -find_library(OpenCV_TRS_LIBRARY - NAMES trs - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_TRS_LIBRARY=${OpenCV_TRS_LIBRARY}") - -# DEBUG VERSIONS: -find_library(OpenCV_CVd_LIBRARY - NAMES cvd opencvd cvd0.9.7 - PATHS ${OpenCV_ROOT_DIR} - PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CVd_LIBRARY=${OpenCV_CVd_LIBRARY}") -find_library(OpenCV_CVAUXd_LIBRARY - NAMES cvauxd cvauxd0.9.7 - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CVAUXd_LIBRARY=${OpenCV_CVAUXd_LIBRARY}") -find_library(OpenCV_CVCAMd_LIBRARY - NAMES cvcamd - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CVCAMd_LIBRARY=${OpenCV_CVCAMd_LIBRARY}") -find_library(OpenCV_CVHAARTRAININGd_LIBRARY - NAMES cvhaartrainingd - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CVHAARTRAININGd_LIBRARY=${OpenCV_CVHAARTRAININGd_LIBRARY}") -find_library(OpenCV_CXCOREd_LIBRARY - NAMES cxcored cxcored0.9.7 - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CXCOREd_LIBRARY=${OpenCV_CXCOREd_LIBRARY}") -find_library(OpenCV_CXTSd_LIBRARY - NAMES cxtsd - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_CXTSd_LIBRARY=${OpenCV_CXTSd_LIBRARY}") -find_library(OpenCV_HIGHGUId_LIBRARY - NAMES highguid highguid0.9.7 - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_HIGHGUId_LIBRARY=${OpenCV_HIGHGUId_LIBRARY}") -find_library(OpenCV_MLd_LIBRARY - NAMES mld - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_MLd_LIBRARY=${OpenCV_MLd_LIBRARY}") -find_library(OpenCV_TRSd_LIBRARY - NAMES trs - PATHS ${OpenCV_ROOT_DIR} PATH_SUFFIXES ${OpenCV_LIBDIR_SUFFIXES} - NO_CMAKE_SYSTEM_PATH ) -DBG_MSG("OpenCV_TRSd_LIBRARY=${OpenCV_TRSd_LIBRARY}") - - - -# -# Logic selecting required libs and headers -# -set(OpenCV_FOUND ON) -DBG_MSG("OpenCV_FIND_REQUIRED_COMPONENTS=${OpenCV_FIND_REQUIRED_COMPONENTS}") -foreach(NAME ${OpenCV_FIND_REQUIRED_COMPONENTS} ) - - # only good if header and library both found - if (OpenCV_${NAME}_INCLUDE_DIR AND OpenCV_${NAME}_LIBRARY) - list(APPEND OpenCV_INCLUDE_DIRS ${OpenCV_${NAME}_INCLUDE_DIR} ) - if (EXISTS "${OpenCV_${NAME}_LIBRARY}" AND EXISTS "${OpenCV_${NAME}d_LIBRARY}") - #message(STATUS "DEBUG *************** ${OpenCV_${NAME}d_LIBRARY}") - list(APPEND OpenCV_LIBRARIES debug;${OpenCV_${NAME}d_LIBRARY};optimized;${OpenCV_${NAME}_LIBRARY} ) - else(EXISTS "${OpenCV_${NAME}_LIBRARY}" AND EXISTS "${OpenCV_${NAME}d_LIBRARY}") - list(APPEND OpenCV_LIBRARIES ${OpenCV_${NAME}_LIBRARY} ) - endif(EXISTS "${OpenCV_${NAME}_LIBRARY}" AND EXISTS "${OpenCV_${NAME}d_LIBRARY}") - DBG_MSG("appending for NAME=${NAME} ${OpenCV_${NAME}_INCLUDE_DIR} and ${OpenCV_${NAME}_LIBRARY}" ) - else (OpenCV_${NAME}_INCLUDE_DIR AND OpenCV_${NAME}_LIBRARY) - DBG_MSG("OpenCV component NAME=${NAME} not found! " - "\nOpenCV_${NAME}_INCLUDE_DIR=${OpenCV_${NAME}_INCLUDE_DIR} " - "\nOpenCV_${NAME}_LIBRARY=${OpenCV_${NAME}_LIBRARY} ") - set(OpenCV_FOUND OFF) - endif (OpenCV_${NAME}_INCLUDE_DIR AND OpenCV_${NAME}_LIBRARY) - -endforeach(NAME) - -DBG_MSG("OpenCV_INCLUDE_DIRS=${OpenCV_INCLUDE_DIRS}") -DBG_MSG("OpenCV_LIBRARIES=${OpenCV_LIBRARIES}") - -# get the link directory for rpath to be used with LINK_DIRECTORIES: -if (OpenCV_CV_LIBRARY) - get_filename_component(OpenCV_LINK_DIRECTORIES ${OpenCV_CV_LIBRARY} PATH) -endif (OpenCV_CV_LIBRARY) - -mark_as_advanced( - OpenCV_ROOT_DIR - OpenCV_INCLUDE_DIRS - OpenCV_CV_INCLUDE_DIR - OpenCV_CXCORE_INCLUDE_DIR - OpenCV_CVAUX_INCLUDE_DIR - OpenCV_CVCAM_INCLUDE_DIR - OpenCV_HIGHGUI_INCLUDE_DIR - OpenCV_LIBRARIES - OpenCV_CV_LIBRARY - OpenCV_CXCORE_LIBRARY - OpenCV_CVAUX_LIBRARY - OpenCV_CVCAM_LIBRARY - OpenCV_CVHAARTRAINING_LIBRARY - OpenCV_CXTS_LIBRARY - OpenCV_HIGHGUI_LIBRARY - OpenCV_ML_LIBRARY - OpenCV_TRS_LIBRARY - OpenCV_CVd_LIBRARY - OpenCV_CXCOREd_LIBRARY - OpenCV_CVAUXd_LIBRARY - OpenCV_CVCAMd_LIBRARY - OpenCV_CVHAARTRAININGd_LIBRARY - OpenCV_CXTSd_LIBRARY - OpenCV_HIGHGUId_LIBRARY - OpenCV_MLd_LIBRARY - OpenCV_TRSd_LIBRARY - ) - - -# be backward compatible: -set(OPENCV_LIBRARIES ${OpenCV_LIBRARIES} ) -set(OPENCV_INCLUDE_DIR ${OpenCV_INCLUDE_DIRS} ) -set(OPENCV_FOUND ${OpenCV_FOUND}) - - - -# display help message -if(NOT OpenCV_FOUND) - # make FIND_PACKAGE friendly - if(NOT OpenCV_FIND_QUIETLY) - if(OpenCV_FIND_REQUIRED) - message(FATAL_ERROR - "OpenCV required but some headers or libs not found. Please specify it's location with OpenCV_ROOT_DIR env. variable.") - else(OpenCV_FIND_REQUIRED) - message(STATUS - "ERROR: OpenCV was not found.") - endif(OpenCV_FIND_REQUIRED) - endif(NOT OpenCV_FIND_QUIETLY) -endif(NOT OpenCV_FOUND) - -# make FIND_PACKAGE case sensitive compatible -set(OpenCV_FOUND ${OPENCV_FOUND}) -set(OpenCV_LIBRARIES ${OPENCV_LIBRARIES}) -set(OpenCV_INCLUDE_DIR ${OPENCV_INCLUDE_DIR}) From 5fb6c5861f29af547422892461aa42480e295410 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Fri, 12 Jul 2024 22:36:55 +0200 Subject: [PATCH 08/11] fix changelog date to unrelased --- doc/source/doxygen-docs/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/doxygen-docs/changelog.md b/doc/source/doxygen-docs/changelog.md index b511189701..7737b50eb3 100644 --- a/doc/source/doxygen-docs/changelog.md +++ b/doc/source/doxygen-docs/changelog.md @@ -1,6 +1,6 @@ \page changelog Change Log -# Version 2.13.4: Released July 11th, 2024 +# Version 2.13.4: UNRELEASED - Fix docs typos. - Upgraded nanoflann to v1.6.0 (fixes an important bug). From 043ad0bb5f5c617488b9226694fa34b68d513be2 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Fri, 12 Jul 2024 22:40:14 +0200 Subject: [PATCH 09/11] Fix wxWidgets deprecated warning --- apps/2d-slam-demo/slamdemoMain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/2d-slam-demo/slamdemoMain.cpp b/apps/2d-slam-demo/slamdemoMain.cpp index 9d7d29b89e..4fe2c104b0 100644 --- a/apps/2d-slam-demo/slamdemoMain.cpp +++ b/apps/2d-slam-demo/slamdemoMain.cpp @@ -728,7 +728,7 @@ slamdemoFrame::slamdemoFrame(wxWindow* parent, wxWindowID id) // IC plot ------------ m_lyICvisibleRange = new mpPolygon(); - m_lyICvisibleRange->SetPen(wxPen(wxColour(0, 0, 0), 1, wxLONG_DASH)); + m_lyICvisibleRange->SetPen(wxPen(wxColour(0, 0, 0), 1, wxPENSTYLE_LONG_DASH)); m_lyICvisibleRange->SetContinuity(true); m_lyICvisibleRange->SetCoordinateBase(0, 0, 0); plotIndivCompat->AddLayer(m_lyICvisibleRange); From 08a8acd000224a977c820c6e187441e794c90215 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Wed, 17 Jul 2024 01:33:19 +0200 Subject: [PATCH 10/11] Update copyright year --- apps/rosbag2rawlog/rosbag2rawlog_main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/rosbag2rawlog/rosbag2rawlog_main.cpp b/apps/rosbag2rawlog/rosbag2rawlog_main.cpp index 89705a69a2..60443d231a 100644 --- a/apps/rosbag2rawlog/rosbag2rawlog_main.cpp +++ b/apps/rosbag2rawlog/rosbag2rawlog_main.cpp @@ -13,7 +13,7 @@ // as a RawLog file, easily readable by MRPT C++ programs. // // Started: Hunter Laux @ SEPT-2018. -// Maintained: JLBC @ 2018-2023 +// Maintained: JLBC @ 2018-2024 // =========================================================================== #include // this header is obsolete in ros2-I but as long as this app is only built for ros1 we are ok From a54428154a1f562c20251c55fc33ad207f227a51 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Wed, 24 Jul 2024 12:44:35 +0200 Subject: [PATCH 11/11] changelog --- doc/source/doxygen-docs/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/doxygen-docs/changelog.md b/doc/source/doxygen-docs/changelog.md index 7737b50eb3..daf75d70bf 100644 --- a/doc/source/doxygen-docs/changelog.md +++ b/doc/source/doxygen-docs/changelog.md @@ -1,6 +1,6 @@ \page changelog Change Log -# Version 2.13.4: UNRELEASED +# Version 2.13.4: Released July 24th, 2024 - Fix docs typos. - Upgraded nanoflann to v1.6.0 (fixes an important bug).