From 5fe91dc597343e0a8f185e9c5b6d9d56b45f1dc3 Mon Sep 17 00:00:00 2001
From: Nicolas Pope <nwpope@utu.fi>
Date: Sat, 7 Mar 2020 20:44:48 +0200
Subject: [PATCH] Minor corrections and Werror
---
CMakeLists.txt | 2 +-
applications/gui/src/frameset_mgr.cpp | 2 +-
components/rgbd-sources/include/ftl/rgbd/camera.hpp | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce1b438e4..f60dd1cd2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -328,7 +328,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 -Werror=return-type")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -msse3 -Werror")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -pg -Wall")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -Wall -mfpmath=sse")
set(OS_LIBS "dl")
diff --git a/applications/gui/src/frameset_mgr.cpp b/applications/gui/src/frameset_mgr.cpp
index 70a0b226f..479f224d9 100644
--- a/applications/gui/src/frameset_mgr.cpp
+++ b/applications/gui/src/frameset_mgr.cpp
@@ -4,6 +4,6 @@
static int frameset_counter = 0;
int ftl::gui::mapToFrameset(const std::string &uri) {
- ftl::URI u(uri);
+ //ftl::URI u(uri);
return frameset_counter++;
}
diff --git a/components/rgbd-sources/include/ftl/rgbd/camera.hpp b/components/rgbd-sources/include/ftl/rgbd/camera.hpp
index 2abcf8f87..8006414d5 100644
--- a/components/rgbd-sources/include/ftl/rgbd/camera.hpp
+++ b/components/rgbd-sources/include/ftl/rgbd/camera.hpp
@@ -40,17 +40,17 @@ struct __align__(16) Camera {
/**
* Convert screen plus depth into camera coordinates.
*/
- __device__ float3 screenToCam(int ux, int uy, float depth) const;
+ __host__ __device__ float3 screenToCam(int ux, int uy, float depth) const;
/**
* Convert screen plus depth into camera coordinates.
*/
- __device__ float3 screenToCam(uint ux, uint uy, float depth) const;
+ __host__ __device__ float3 screenToCam(uint ux, uint uy, float depth) const;
/**
* Convert screen plus depth into camera coordinates.
*/
- __device__ float3 screenToCam(float ux, float uy, float depth) const;
+ __host__ __device__ float3 screenToCam(float ux, float uy, float depth) const;
#ifndef __CUDACC__
--
GitLab