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

Updated opencv license to Apache2 when version >= 4.5

Browse Source
This commit is contained in:
matlabbe
2021-02-21 13:03:19 -05:00
parent 8696a38343
commit 5cdb346a35
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+8
View File
@@ -1085,12 +1085,20 @@ IF(OpenCV_FOUND)
ELSE() ELSE()
IF(OPENCV_XFEATURES2D_FOUND) IF(OPENCV_XFEATURES2D_FOUND)
IF(NONFREE STREQUAL "//") IF(NONFREE STREQUAL "//")
IF((OpenCV_VERSION_MAJOR LESS 4) OR ((OpenCV_VERSION_MAJOR EQUAL 4) AND (OpenCV_VERSION_MINOR LESS 5)))
MESSAGE(STATUS " *With OpenCV ${OpenCV_VERSION} xfeatures2d = YES, nonfree = NO (License: BSD)") MESSAGE(STATUS " *With OpenCV ${OpenCV_VERSION} xfeatures2d = YES, nonfree = NO (License: BSD)")
ELSE()
MESSAGE(STATUS " *With OpenCV ${OpenCV_VERSION} xfeatures2d = YES, nonfree = NO (License: Apache 2)")
ENDIF()
ELSE() ELSE()
MESSAGE(STATUS " *With OpenCV ${OpenCV_VERSION} xfeatures2d = YES, nonfree = YES (License: Non commercial)") MESSAGE(STATUS " *With OpenCV ${OpenCV_VERSION} xfeatures2d = YES, nonfree = YES (License: Non commercial)")
ENDIF() ENDIF()
ELSE() ELSE()
IF((OpenCV_VERSION_MAJOR LESS 4) OR ((OpenCV_VERSION_MAJOR EQUAL 4) AND (OpenCV_VERSION_MINOR LESS 5)))
MESSAGE(STATUS " *With OpenCV ${OpenCV_VERSION} xfeatures2d = NO, nonfree = NO (License: BSD)") MESSAGE(STATUS " *With OpenCV ${OpenCV_VERSION} xfeatures2d = NO, nonfree = NO (License: BSD)")
ELSE()
MESSAGE(STATUS " *With OpenCV ${OpenCV_VERSION} xfeatures2d = NO, nonfree = NO (License: Apache 2)")
ENDIF()
ENDIF() ENDIF()
ENDIF() ENDIF()
ENDIF(OpenCV_FOUND) ENDIF(OpenCV_FOUND)
guilib/src/CalibrationDialog.cpp
+5 -4
View File
@@ -105,7 +105,6 @@ CalibrationDialog::CalibrationDialog(bool stereo, const QString & savingDirector
ui_->checkBox_switchImages->setChecked(switchImages); ui_->checkBox_switchImages->setChecked(switchImages);
ui_->checkBox_fisheye->setChecked(false); ui_->checkBox_fisheye->setChecked(false);
ui_->checkBox_fisheye->setEnabled(false);
this->setStereoMode(stereo_); this->setStereoMode(stereo_);
} }
@@ -519,7 +518,11 @@ void CalibrationDialog::processImages(const cv::Mat & imageLeft, const cv::Mat &
ui_->progressBar_count_2->setValue((int)imagePoints_[id].size()); ui_->progressBar_count_2->setValue((int)imagePoints_[id].size());
} }
if(imagePoints_[id].size() >= COUNT_MIN && xGood > 0.5 && yGood > 0.5 && sizeGood > 0.4 && skewGood > 0.5) if(imagePoints_[id].size() >= COUNT_MIN &&
xGood > 0.5 &&
yGood > 0.5 &&
(sizeGood > 0.4 || (ui_->checkBox_fisheye->isChecked() && sizeGood > 0.25)) &&
skewGood > 0.5)
{ {
readyToCalibrate[id] = true; readyToCalibrate[id] = true;
} }
@@ -636,7 +639,6 @@ void CalibrationDialog::restart()
maxIrs_[1] = 0x7fff; maxIrs_[1] = 0x7fff;
ui_->pushButton_calibrate->setEnabled(ui_->checkBox_unlock->isChecked()); ui_->pushButton_calibrate->setEnabled(ui_->checkBox_unlock->isChecked());
ui_->checkBox_fisheye->setEnabled(ui_->checkBox_unlock->isChecked());
ui_->pushButton_save->setEnabled(false); ui_->pushButton_save->setEnabled(false);
ui_->radioButton_raw->setChecked(true); ui_->radioButton_raw->setChecked(true);
ui_->radioButton_rectified->setEnabled(false); ui_->radioButton_rectified->setEnabled(false);
@@ -680,7 +682,6 @@ void CalibrationDialog::restart()
void CalibrationDialog::unlock() void CalibrationDialog::unlock()
{ {
ui_->pushButton_calibrate->setEnabled(true); ui_->pushButton_calibrate->setEnabled(true);
ui_->checkBox_fisheye->setEnabled(true);
} }
void CalibrationDialog::calibrate() void CalibrationDialog::calibrate()