From 6e7f99dd62106af86da1df6e232ace91f8e5b81d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 19 Jan 2022 21:29:01 +0100 Subject: [PATCH 1/4] Fix compiler warnings --- src/exe/model.cc | 2 +- src/feature/matching.cc | 2 +- src/feature/sift.cc | 1 + src/ui/main_window.cc | 12 ++++++------ src/ui/model_viewer_widget.cc | 10 +++++----- src/ui/movie_grabber_widget.cc | 2 +- src/ui/reconstruction_manager_widget.cc | 4 ++-- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/exe/model.cc b/src/exe/model.cc index 18d01f4ea8..6b9202de06 100644 --- a/src/exe/model.cc +++ b/src/exe/model.cc @@ -133,7 +133,7 @@ void ReadDatabaseCameraLocations(const std::string& database_path, auto images = database.ReadAllImages(); std::vector gps_locations; GPSTransform gps_transform(GPSTransform::WGS84); - for (const auto image : images) { + for (const auto& image : images) { if (image.HasTvecPrior()) { ref_image_names.push_back(image.Name()); gps_locations.push_back(image.TvecPrior()); diff --git a/src/feature/matching.cc b/src/feature/matching.cc index 0037b3c6fa..61c6066381 100644 --- a/src/feature/matching.cc +++ b/src/feature/matching.cc @@ -809,7 +809,7 @@ void SiftFeatureMatcher::Match( image_pair_ids.reserve(image_pairs.size()); size_t num_outputs = 0; - for (const auto image_pair : image_pairs) { + for (const auto& image_pair : image_pairs) { // Avoid self-matches. if (image_pair.first == image_pair.second) { continue; diff --git a/src/feature/sift.cc b/src/feature/sift.cc index d3f759cd71..ac536d9ce6 100644 --- a/src/feature/sift.cc +++ b/src/feature/sift.cc @@ -31,6 +31,7 @@ #include "feature/sift.h" +#include // Needs to be included before glew. #include #include #include diff --git a/src/ui/main_window.cc b/src/ui/main_window.cc index af1a38f938..28ffdd184c 100755 --- a/src/ui/main_window.cc +++ b/src/ui/main_window.cc @@ -1247,11 +1247,11 @@ void MainWindow::ResetOptions() { void MainWindow::About() { QMessageBox::about( this, tr("About"), - QString().sprintf("%s
" - "(%s)

" - "Author: Johannes L. Schönberger

" - "Email: jsch-at-demuc-dot-de", - GetVersionInfo().c_str(), GetBuildInfo().c_str())); + QString().asprintf("%s
" + "(%s)

" + "Author: Johannes L. Schönberger

" + "Email: jsch-at-demuc-dot-de", + GetVersionInfo().c_str(), GetBuildInfo().c_str())); } void MainWindow::Documentation() { @@ -1284,7 +1284,7 @@ void MainWindow::UpdateTimer() { const int minutes = (elapsed_time / 60) % 60; const int hours = (elapsed_time / 3600) % 24; const int days = elapsed_time / 86400; - statusbar_timer_label_->setText(QString().sprintf( + statusbar_timer_label_->setText(QString().asprintf( "Time %02d:%02d:%02d:%02d", days, hours, minutes, seconds)); } diff --git a/src/ui/model_viewer_widget.cc b/src/ui/model_viewer_widget.cc index dca6e61d22..4c0c61192d 100644 --- a/src/ui/model_viewer_widget.cc +++ b/src/ui/model_viewer_widget.cc @@ -281,7 +281,7 @@ void ModelViewerWidget::ReloadReconstruction() { images[image_id] = reconstruction->Image(image_id); } - statusbar_status_label->setText(QString().sprintf( + statusbar_status_label->setText(QString().asprintf( "%d Images - %d Points", static_cast(reg_image_ids.size()), static_cast(points3D.size()))); @@ -629,13 +629,13 @@ void ModelViewerWidget::mouseMoveEvent(QMouseEvent* event) { void ModelViewerWidget::wheelEvent(QWheelEvent* event) { if (event->modifiers() & Qt::ControlModifier) { - ChangePointSize(event->delta()); + ChangePointSize(event->angleDelta().y()); } else if (event->modifiers() & Qt::AltModifier) { - ChangeCameraSize(event->delta()); + ChangeCameraSize(event->angleDelta().y()); } else if (event->modifiers() & Qt::ShiftModifier) { - ChangeNearPlane(event->delta()); + ChangeNearPlane(event->angleDelta().y()); } else { - ChangeFocusDistance(event->delta()); + ChangeFocusDistance(event->angleDelta().y()); } event->accept(); } diff --git a/src/ui/movie_grabber_widget.cc b/src/ui/movie_grabber_widget.cc index e45ffbc9b0..e29c172cf3 100644 --- a/src/ui/movie_grabber_widget.cc +++ b/src/ui/movie_grabber_widget.cc @@ -256,7 +256,7 @@ void MovieGrabberWidget::Assemble() { QImage image = model_viewer_widget_->GrabImage(); image.save(dir.filePath( - "frame" + QString().sprintf("%06zu", frame_number) + ".png")); + "frame" + QString().asprintf("%06zu", frame_number) + ".png")); frame_number += 1; } diff --git a/src/ui/reconstruction_manager_widget.cc b/src/ui/reconstruction_manager_widget.cc index 90de44276a..a31c52a822 100755 --- a/src/ui/reconstruction_manager_widget.cc +++ b/src/ui/reconstruction_manager_widget.cc @@ -59,12 +59,12 @@ void ReconstructionManagerWidget::Update() { int max_width = 0; for (size_t i = 0; i < reconstruction_manager_->Size(); ++i) { - const QString item = QString().sprintf( + const QString item = QString().asprintf( "Model %d (%d images, %d points)", static_cast(i + 1), static_cast(reconstruction_manager_->Get(i).NumRegImages()), static_cast(reconstruction_manager_->Get(i).NumPoints3D())); QFontMetrics font_metrics(view()->font()); - max_width = std::max(max_width, font_metrics.width(item)); + max_width = std::max(max_width, font_metrics.horizontalAdvance(item)); addItem(item); } From a59043bf67ffc6a7cc2d5760d17d86a07c457a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 20 Jan 2022 13:50:35 +0100 Subject: [PATCH 2/4] fix --- src/feature/sift.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/feature/sift.cc b/src/feature/sift.cc index ac536d9ce6..d3f759cd71 100644 --- a/src/feature/sift.cc +++ b/src/feature/sift.cc @@ -31,7 +31,6 @@ #include "feature/sift.h" -#include // Needs to be included before glew. #include #include #include From 238474ebfab32b53c8e8fec0a58e731525c946ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 20 Jan 2022 14:05:28 +0100 Subject: [PATCH 3/4] Fix --- src/feature/sift.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/feature/sift.cc b/src/feature/sift.cc index d3f759cd71..bc17352467 100644 --- a/src/feature/sift.cc +++ b/src/feature/sift.cc @@ -36,7 +36,9 @@ #include #include "FLANN/flann.hpp" -#include "GL/glew.h" // Needed if CUDA / GUI is not available. +#if !defined(GUI_ENABLED) && !defined(CUDA_ENABLED) +#include "GL/glew.h" +#endif #include "SiftGPU/SiftGPU.h" #include "VLFeat/covdet.h" #include "VLFeat/sift.h" From 372e8a84640ed65912b6971684ed8db0e69a2119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 20 Jan 2022 14:06:27 +0100 Subject: [PATCH 4/4] Fix --- src/ui/reconstruction_manager_widget.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/reconstruction_manager_widget.cc b/src/ui/reconstruction_manager_widget.cc index a31c52a822..4541389360 100755 --- a/src/ui/reconstruction_manager_widget.cc +++ b/src/ui/reconstruction_manager_widget.cc @@ -64,7 +64,7 @@ void ReconstructionManagerWidget::Update() { static_cast(reconstruction_manager_->Get(i).NumRegImages()), static_cast(reconstruction_manager_->Get(i).NumPoints3D())); QFontMetrics font_metrics(view()->font()); - max_width = std::max(max_width, font_metrics.horizontalAdvance(item)); + max_width = std::max(max_width, font_metrics.width(item)); addItem(item); }