From 190eddf8c3876e7856853139fe76e33fda880f57 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 2 Jul 2024 14:55:42 +0300 Subject: [PATCH] Warnings fix for Ubuntu 24.04. --- 3rdparty/clapack/CMakeLists.txt | 2 +- modules/3d/perf/perf_tsdf.cpp | 12 ++++++------ modules/3d/test/test_tsdf.cpp | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/3rdparty/clapack/CMakeLists.txt b/3rdparty/clapack/CMakeLists.txt index 5357c94f85..582168fc90 100644 --- a/3rdparty/clapack/CMakeLists.txt +++ b/3rdparty/clapack/CMakeLists.txt @@ -23,7 +23,7 @@ set(the_target "libclapack") add_library(${the_target} STATIC ${lapack_srcs} ${runtime_srcs} ${lib_hdrs}) ocv_warnings_disable(CMAKE_C_FLAGS -Wno-parentheses -Wno-uninitialized -Wno-array-bounds - -Wno-implicit-function-declaration -Wno-unused -Wunused-parameter) # gcc/clang warnings + -Wno-implicit-function-declaration -Wno-unused -Wunused-parameter -Wstringop-truncation) # gcc/clang warnings ocv_warnings_disable(CMAKE_C_FLAGS /wd4244 /wd4554 /wd4723 /wd4819) # visual studio warnings set_target_properties(${the_target} diff --git a/modules/3d/perf/perf_tsdf.cpp b/modules/3d/perf/perf_tsdf.cpp index 121ec5feb1..59fe15de23 100644 --- a/modules/3d/perf/perf_tsdf.cpp +++ b/modules/3d/perf/perf_tsdf.cpp @@ -157,8 +157,8 @@ struct Scene { virtual ~Scene() {} static Ptr create(Size sz, Matx33f _intr, float _depthFactor, bool onlySemisphere); - virtual Mat depth(Affine3f pose) = 0; - virtual Mat rgb(Affine3f pose) = 0; + virtual Mat_ depth(Affine3f pose) = 0; + virtual Mat_ rgb(Affine3f pose) = 0; virtual std::vector getPoses() = 0; }; @@ -198,7 +198,7 @@ struct SemisphereScene : Scene return res; } - Mat depth(Affine3f pose) override + Mat_ depth(Affine3f pose) override { Mat_ frame(frameSize); Reprojector reproj(intr); @@ -206,10 +206,10 @@ struct SemisphereScene : Scene Range range(0, frame.rows); parallel_for_(range, RenderInvoker(frame, pose, reproj, depthFactor, onlySemisphere)); - return std::move(frame); + return frame; } - Mat rgb(Affine3f pose) override + Mat_ rgb(Affine3f pose) override { Mat_ frame(frameSize); Reprojector reproj(intr); @@ -217,7 +217,7 @@ struct SemisphereScene : Scene Range range(0, frame.rows); parallel_for_(range, RenderColorInvoker(frame, pose, reproj, depthFactor, onlySemisphere)); - return std::move(frame); + return frame; } std::vector getPoses() override diff --git a/modules/3d/test/test_tsdf.cpp b/modules/3d/test/test_tsdf.cpp index 948149aa51..20077e830e 100644 --- a/modules/3d/test/test_tsdf.cpp +++ b/modules/3d/test/test_tsdf.cpp @@ -158,8 +158,8 @@ struct Scene { virtual ~Scene() {} static Ptr create(Size sz, Matx33f _intr, float _depthFactor, bool onlySemisphere); - virtual Mat depth(Affine3f pose) = 0; - virtual Mat rgb(Affine3f pose) = 0; + virtual Mat_ depth(Affine3f pose) = 0; + virtual Mat_ rgb(Affine3f pose) = 0; virtual std::vector getPoses() = 0; }; @@ -199,7 +199,7 @@ struct SemisphereScene : Scene return res; } - Mat depth(Affine3f pose) override + Mat_ depth(Affine3f pose) override { Mat_ frame(frameSize); Reprojector reproj(intr); @@ -207,10 +207,10 @@ struct SemisphereScene : Scene Range range(0, frame.rows); parallel_for_(range, RenderInvoker(frame, pose, reproj, depthFactor, onlySemisphere)); - return std::move(frame); + return frame; } - Mat rgb(Affine3f pose) override + Mat_ rgb(Affine3f pose) override { Mat_ frame(frameSize); Reprojector reproj(intr); @@ -218,7 +218,7 @@ struct SemisphereScene : Scene Range range(0, frame.rows); parallel_for_(range, RenderColorInvoker(frame, pose, reproj, depthFactor, onlySemisphere)); - return std::move(frame); + return frame; } std::vector getPoses() override