From b040d5725e2a445d7c593514f2c6898aac05178e Mon Sep 17 00:00:00 2001
From: Sebastian Hahta <joseha@utu.fi>
Date: Sun, 22 Mar 2020 14:55:41 +0200
Subject: [PATCH] fix windows build
---
.../include/ftl/operators/cuda/disparity.hpp | 4 ++--
components/operators/src/disparity/disp2depth.cu | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/operators/include/ftl/operators/cuda/disparity.hpp b/components/operators/include/ftl/operators/cuda/disparity.hpp
index 15808970e..de4648f6f 100644
--- a/components/operators/include/ftl/operators/cuda/disparity.hpp
+++ b/components/operators/include/ftl/operators/cuda/disparity.hpp
@@ -5,11 +5,11 @@ namespace cuda {
template<typename T_in, typename T_out>
void disparity_to_depth(const cv::cuda::GpuMat &depth, cv::cuda::GpuMat &disparity,
- const ftl::rgbd::Camera &c, const float scale=1.0f, cudaStream_t &stream=0);
+ const ftl::rgbd::Camera &c, float scale, cudaStream_t &stream);
template<typename T_in, typename T_out>
void depth_to_disparity(const cv::cuda::GpuMat &depth, cv::cuda::GpuMat &disparity,
- const ftl::rgbd::Camera &c, const float scale=1.0f, cudaStream_t &stream=0);
+ const ftl::rgbd::Camera &c, float scale, cudaStream_t &stream);
void remove_occlusions(cv::cuda::GpuMat &depth, const cv::cuda::GpuMat &depthR,
const ftl::rgbd::Camera &c, cudaStream_t stream);
diff --git a/components/operators/src/disparity/disp2depth.cu b/components/operators/src/disparity/disp2depth.cu
index d8a22949a..c0011adf4 100644
--- a/components/operators/src/disparity/disp2depth.cu
+++ b/components/operators/src/disparity/disp2depth.cu
@@ -25,7 +25,7 @@ namespace cuda {
template<typename T_in, typename T_out>
void disparity_to_depth(const cv::cuda::GpuMat &disparity, cv::cuda::GpuMat &depth,
- const ftl::rgbd::Camera &c, const float scale, cudaStream_t &stream) {
+ const ftl::rgbd::Camera &c, float scale, cudaStream_t &stream) {
dim3 grid(1,1,1);
dim3 threads(128, 1, 1);
grid.x = cv::cuda::device::divUp(disparity.cols, 128);
@@ -35,8 +35,8 @@ namespace cuda {
cudaSafeCall( cudaGetLastError() );
}
- template void disparity_to_depth<short, float>(const cv::cuda::GpuMat&, cv::cuda::GpuMat&, const ftl::rgbd::Camera&, const float, cudaStream_t&);
- template void disparity_to_depth<float, float>(const cv::cuda::GpuMat&, cv::cuda::GpuMat&, const ftl::rgbd::Camera&, const float, cudaStream_t&);
+ template void disparity_to_depth<short, float>(const cv::cuda::GpuMat&, cv::cuda::GpuMat&, const ftl::rgbd::Camera&, float, cudaStream_t&);
+ template void disparity_to_depth<float, float>(const cv::cuda::GpuMat&, cv::cuda::GpuMat&, const ftl::rgbd::Camera&, float, cudaStream_t&);
}
}
@@ -59,7 +59,7 @@ namespace cuda {
template<typename T_in, typename T_out>
void depth_to_disparity(const cv::cuda::GpuMat &depth, cv::cuda::GpuMat &disparity,
- const ftl::rgbd::Camera &c, const float scale, cudaStream_t &stream) {
+ const ftl::rgbd::Camera &c, float scale, cudaStream_t &stream) {
dim3 grid(1,1,1);
dim3 threads(128, 1, 1);
grid.x = cv::cuda::device::divUp(disparity.cols, 128);
@@ -69,8 +69,8 @@ namespace cuda {
cudaSafeCall( cudaGetLastError() );
}
- template void depth_to_disparity<float, float>(const cv::cuda::GpuMat&, cv::cuda::GpuMat&, const ftl::rgbd::Camera&, const float, cudaStream_t&);
- template void depth_to_disparity<float, short>(const cv::cuda::GpuMat&, cv::cuda::GpuMat&, const ftl::rgbd::Camera&, const float, cudaStream_t&);
+ template void depth_to_disparity<float, float>(const cv::cuda::GpuMat&, cv::cuda::GpuMat&, const ftl::rgbd::Camera&, float, cudaStream_t&);
+ template void depth_to_disparity<float, short>(const cv::cuda::GpuMat&, cv::cuda::GpuMat&, const ftl::rgbd::Camera&, float, cudaStream_t&);
}
}
--
GitLab