Skip to content
Snippets Groups Projects
Commit 2220bf23 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

More werror fixes

parent b288ae66
No related branches found
No related tags found
No related merge requests found
Pipeline #22757 failed
...@@ -451,7 +451,7 @@ void runCameraCalibration( ftl::Configurable* root, ...@@ -451,7 +451,7 @@ void runCameraCalibration( ftl::Configurable* root,
vector<Mat> rgb(n_cameras); vector<Mat> rgb(n_cameras);
std::this_thread::sleep_for(std::chrono::seconds(3)); // rectification disabled, has some delay std::this_thread::sleep_for(std::chrono::seconds(3)); // rectification disabled, has some delay
while(calib.getMinVisibility() < n_views) { while(calib.getMinVisibility() < static_cast<size_t>(n_views)) {
loop: loop:
cv::waitKey(10); cv::waitKey(10);
...@@ -501,7 +501,7 @@ void runCameraCalibration( ftl::Configurable* root, ...@@ -501,7 +501,7 @@ void runCameraCalibration( ftl::Configurable* root,
for (size_t i = 0; i < n_cameras; i++) { for (size_t i = 0; i < n_cameras; i++) {
if (visible[i]) { if (visible[i]) {
for (int j = 0; j < points[i].size(); j++) { for (size_t j = 0; j < points[i].size(); j++) {
cv::drawMarker( rgb[i], points[i][j], Scalar(42, 255, 42), cv::MARKER_CROSS, 25, 1); cv::drawMarker( rgb[i], points[i][j], Scalar(42, 255, 42), cv::MARKER_CROSS, 25, 1);
cv::putText(rgb[i], std::to_string(j), Point2i(points[i][j]), cv::putText(rgb[i], std::to_string(j), Point2i(points[i][j]),
cv::FONT_HERSHEY_COMPLEX_SMALL, 1.0, Scalar(64, 64, 255), 1); cv::FONT_HERSHEY_COMPLEX_SMALL, 1.0, Scalar(64, 64, 255), 1);
......
...@@ -614,7 +614,7 @@ double MultiCameraCalibrationNew::getReprojectionErrorOptimized(size_t c_from, c ...@@ -614,7 +614,7 @@ double MultiCameraCalibrationNew::getReprojectionErrorOptimized(size_t c_from, c
double MultiCameraCalibrationNew::calibrateAll(int reference_camera) { double MultiCameraCalibrationNew::calibrateAll(int reference_camera) {
if (reference_camera != -1) { if (reference_camera != -1) {
DCHECK(reference_camera >= 0 && reference_camera < n_cameras_); DCHECK(reference_camera >= 0 && reference_camera < static_cast<int>(n_cameras_));
reference_camera_ = reference_camera; reference_camera_ = reference_camera;
} }
......
...@@ -32,7 +32,7 @@ void Visibility::update(vector<int> &visible) { ...@@ -32,7 +32,7 @@ void Visibility::update(vector<int> &visible) {
int Visibility::getOptimalCamera() { int Visibility::getOptimalCamera() {
// most visible on average // most visible on average
int best_i; int best_i = 0;
double best_score = -INFINITY; double best_score = -INFINITY;
for (int i = 0; i < visibility_.rows; i++) { for (int i = 0; i < visibility_.rows; i++) {
double score = 0.0; double score = 0.0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment