diff --git a/components/operators/include/ftl/operators/cuda/disparity.hpp b/components/operators/include/ftl/operators/cuda/disparity.hpp index 15808970e7ff26ea2a86fe2a1b324f7b9f83f520..de4648f6f4c4d2dfe8681aea6a96d7fbc40b40af 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 d8a22949abbf67a989ebb06f1a96384178d46fd4..c0011adf4d92ea9d30a4f56e1ad9ccbe4c06b976 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&); } }