Merge pull request #25848 from asmorkalov:as/ubuntu_2404_warn_fix

Warnings fix for Ubuntu 24.04.
pull/25855/head
Alexander Smorkalov 5 months ago committed by GitHub
commit fef2c95472
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      3rdparty/clapack/CMakeLists.txt
  2. 12
      modules/3d/perf/perf_tsdf.cpp
  3. 12
      modules/3d/test/test_tsdf.cpp

@ -23,7 +23,7 @@ set(the_target "libclapack")
add_library(${the_target} STATIC ${lapack_srcs} ${runtime_srcs} ${lib_hdrs}) add_library(${the_target} STATIC ${lapack_srcs} ${runtime_srcs} ${lib_hdrs})
ocv_warnings_disable(CMAKE_C_FLAGS -Wno-parentheses -Wno-uninitialized -Wno-array-bounds 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 ocv_warnings_disable(CMAKE_C_FLAGS /wd4244 /wd4554 /wd4723 /wd4819) # visual studio warnings
set_target_properties(${the_target} set_target_properties(${the_target}

@ -157,8 +157,8 @@ struct Scene
{ {
virtual ~Scene() {} virtual ~Scene() {}
static Ptr<Scene> create(Size sz, Matx33f _intr, float _depthFactor, bool onlySemisphere); static Ptr<Scene> create(Size sz, Matx33f _intr, float _depthFactor, bool onlySemisphere);
virtual Mat depth(Affine3f pose) = 0; virtual Mat_<float> depth(Affine3f pose) = 0;
virtual Mat rgb(Affine3f pose) = 0; virtual Mat_<Vec3f> rgb(Affine3f pose) = 0;
virtual std::vector<Affine3f> getPoses() = 0; virtual std::vector<Affine3f> getPoses() = 0;
}; };
@ -198,7 +198,7 @@ struct SemisphereScene : Scene
return res; return res;
} }
Mat depth(Affine3f pose) override Mat_<float> depth(Affine3f pose) override
{ {
Mat_<float> frame(frameSize); Mat_<float> frame(frameSize);
Reprojector reproj(intr); Reprojector reproj(intr);
@ -206,10 +206,10 @@ struct SemisphereScene : Scene
Range range(0, frame.rows); Range range(0, frame.rows);
parallel_for_(range, RenderInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere)); parallel_for_(range, RenderInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere));
return std::move(frame); return frame;
} }
Mat rgb(Affine3f pose) override Mat_<Vec3f> rgb(Affine3f pose) override
{ {
Mat_<Vec3f> frame(frameSize); Mat_<Vec3f> frame(frameSize);
Reprojector reproj(intr); Reprojector reproj(intr);
@ -217,7 +217,7 @@ struct SemisphereScene : Scene
Range range(0, frame.rows); Range range(0, frame.rows);
parallel_for_(range, RenderColorInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere)); parallel_for_(range, RenderColorInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere));
return std::move(frame); return frame;
} }
std::vector<Affine3f> getPoses() override std::vector<Affine3f> getPoses() override

@ -158,8 +158,8 @@ struct Scene
{ {
virtual ~Scene() {} virtual ~Scene() {}
static Ptr<Scene> create(Size sz, Matx33f _intr, float _depthFactor, bool onlySemisphere); static Ptr<Scene> create(Size sz, Matx33f _intr, float _depthFactor, bool onlySemisphere);
virtual Mat depth(Affine3f pose) = 0; virtual Mat_<float> depth(Affine3f pose) = 0;
virtual Mat rgb(Affine3f pose) = 0; virtual Mat_<Vec3f> rgb(Affine3f pose) = 0;
virtual std::vector<Affine3f> getPoses() = 0; virtual std::vector<Affine3f> getPoses() = 0;
}; };
@ -199,7 +199,7 @@ struct SemisphereScene : Scene
return res; return res;
} }
Mat depth(Affine3f pose) override Mat_<float> depth(Affine3f pose) override
{ {
Mat_<float> frame(frameSize); Mat_<float> frame(frameSize);
Reprojector reproj(intr); Reprojector reproj(intr);
@ -207,10 +207,10 @@ struct SemisphereScene : Scene
Range range(0, frame.rows); Range range(0, frame.rows);
parallel_for_(range, RenderInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere)); parallel_for_(range, RenderInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere));
return std::move(frame); return frame;
} }
Mat rgb(Affine3f pose) override Mat_<Vec3f> rgb(Affine3f pose) override
{ {
Mat_<Vec3f> frame(frameSize); Mat_<Vec3f> frame(frameSize);
Reprojector reproj(intr); Reprojector reproj(intr);
@ -218,7 +218,7 @@ struct SemisphereScene : Scene
Range range(0, frame.rows); Range range(0, frame.rows);
parallel_for_(range, RenderColorInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere)); parallel_for_(range, RenderColorInvoker<SemisphereScene>(frame, pose, reproj, depthFactor, onlySemisphere));
return std::move(frame); return frame;
} }
std::vector<Affine3f> getPoses() override std::vector<Affine3f> getPoses() override

Loading…
Cancel
Save