From 5ab362f7c77f8154a5c2013a3953ba37c7524477 Mon Sep 17 00:00:00 2001
From: Sebastian Hahta <joseha@utu.fi>
Date: Mon, 8 Jul 2019 10:19:10 +0300
Subject: [PATCH] added missing return statements; everything seems to work
---
applications/gui/src/camera.cpp | 4 ++--
applications/gui/src/screen.cpp | 1 +
applications/gui/src/thumbview.cpp | 2 ++
applications/registration/src/correspondances.cpp | 2 ++
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/applications/gui/src/camera.cpp b/applications/gui/src/camera.cpp
index 5e1413ddb..10cb7053d 100644
--- a/applications/gui/src/camera.cpp
+++ b/applications/gui/src/camera.cpp
@@ -240,7 +240,7 @@ void ftl::gui::Camera::setChannel(ftl::rgbd::channel_t c) {
}
const GLTexture &ftl::gui::Camera::thumbnail() {
-
+ return GLTexture();
}
const GLTexture &ftl::gui::Camera::captureFrame() {
@@ -309,5 +309,5 @@ const GLTexture &ftl::gui::Camera::captureFrame() {
}
nlohmann::json ftl::gui::Camera::getMetaData() {
-
+ return nlohmann::json();
}
diff --git a/applications/gui/src/screen.cpp b/applications/gui/src/screen.cpp
index e451e4819..f8a04494a 100644
--- a/applications/gui/src/screen.cpp
+++ b/applications/gui/src/screen.cpp
@@ -271,6 +271,7 @@ bool ftl::gui::Screen::mouseMotionEvent(const Eigen::Vector2i &p, const Eigen::V
} else {
if (camera_) camera_->mouseMovement(rel[0], rel[1], button);
}
+ return true; // TODO: return statement was missing; is true correct?
}
bool ftl::gui::Screen::mouseButtonEvent(const nanogui::Vector2i &p, int button, bool down, int modifiers) {
diff --git a/applications/gui/src/thumbview.cpp b/applications/gui/src/thumbview.cpp
index 4b2d03a75..287098587 100644
--- a/applications/gui/src/thumbview.cpp
+++ b/applications/gui/src/thumbview.cpp
@@ -19,6 +19,8 @@ bool ThumbView::mouseButtonEvent(const nanogui::Vector2i &p, int button, bool do
if (button == 0 && !down) {
screen_->setActiveCamera(cam_);
}
+
+ return false; // TODO: return statement was missing; is false correct?
}
void ThumbView::draw(NVGcontext *ctx) {
diff --git a/applications/registration/src/correspondances.cpp b/applications/registration/src/correspondances.cpp
index a05cddfa8..ce662756a 100644
--- a/applications/registration/src/correspondances.cpp
+++ b/applications/registration/src/correspondances.cpp
@@ -255,6 +255,8 @@ bool Correspondances::capture(cv::Mat &rgb1, cv::Mat &rgb2) {
}
}
}
+
+ return true; // TODO: return statement was missing; is true correct?
}
bool Correspondances::add(int tx, int ty, int sx, int sy) {
--
GitLab