Merge branch 'master' of gitlab.utu.fi:nicolas.pope/ftl

CMakeLists.txt

@@ -162,7 +162,7 @@ if (WIN32) # TODO(nick) Should do based upon compiler (VS)
 	set(OS_LIBS "")
 else()
 	add_definitions(-DUNIX)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -msse3")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -msse3 -Werror=return-type")
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -pg -Wall")
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -mfpmath=sse")
 	set(OS_LIBS "dl")

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();
 }

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) {

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) {

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) {