colmap · ahojnnes · Jan 20, 2022 · Jan 19, 2022 · Jan 20, 2022 · Jan 20, 2022
diff --git 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<Eigen::Vector3d> 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
@@ -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
@@ -36,7 +36,9 @@
 #include <memory>
 
 #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"

diff --git 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("<span style='font-weight:normal'><b>%s</b><br />"
-                        "<small>(%s)</small><br /><br />"
-                        "<b>Author:</b> Johannes L. Schönberger<br /><br />"
-                        "<b>Email:</b> jsch-at-demuc-dot-de</span>",
-                        GetVersionInfo().c_str(), GetBuildInfo().c_str()));
+      QString().asprintf("<span style='font-weight:normal'><b>%s</b><br />"
+                         "<small>(%s)</small><br /><br />"
+                         "<b>Author:</b> Johannes L. Schönberger<br /><br />"
+                         "<b>Email:</b> jsch-at-demuc-dot-de</span>",
+                         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
@@ -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<int>(reg_image_ids.size()),
       static_cast<int>(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
@@ -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
@@ -59,7 +59,7 @@ 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<int>(i + 1),
         static_cast<int>(reconstruction_manager_->Get(i).NumRegImages()),
         static_cast<int>(reconstruction_manager_->Get(i).NumPoints3D()));