i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 17:40:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ZED driver timestamp. Re-ordered build include dirs to keep opencv in front. Fixed build with OpenCV 4.7.0.

Browse Source
This commit is contained in:
matlabbe
2024-09-01 03:55:29 -07:00
parent 58b466288d
commit 5580e78273
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
guilib/src/CalibrationDialog.cpp
View File

@@ -161,8 +161,10 @@ CalibrationDialog::CalibrationDialog(bool stereo, const QString & savingDirector
#ifndef HAVE_CHARUCO
ui_->comboBox_board_type->setItemData(1, 0, Qt::UserRole - 1);
ui_->comboBox_board_type->setItemData(2, 0, Qt::UserRole - 1);
#elif CV_MAJOR_VERSION < 4 || (CV_MAJOR_VERSION == 4 && CV_MINOR_VERSION < 7)
#elif CV_MAJOR_VERSION < 4 || (CV_MAJOR_VERSION == 4 && CV_MINOR_VERSION < 6)
ui_->comboBox_board_type->setItemData(2, 0, Qt::UserRole - 1);
#elif CV_MAJOR_VERSION == 4 && CV_MINOR_VERSION < 8
ui_->comboBox_board_type->setItemData(1, 0, Qt::UserRole - 1);
#endif
}
@@ -1289,7 +1291,9 @@ void CalibrationDialog::restart()
ui_->doubleSpinBox_squareSize->value(),
ui_->doubleSpinBox_markerLength->value(),
*markerDictionary_));
#if CV_MAJOR_VERSION > 4 || (CV_MAJOR_VERSION == 4 && CV_MINOR_VERSION >= 8)
charucoBoard_->setLegacyPattern(ui_->comboBox_board_type->currentIndex()==1);
#endif
arucoDetector_.reset(new cv::aruco::ArucoDetector(*markerDictionary_, *arucoDetectorParams_));
charucoDetector_.reset(new cv::aruco::CharucoDetector(*charucoBoard_, cv::aruco::CharucoParameters(), *arucoDetectorParams_));
#else