mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-28 13:10:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #25848 from asmorkalov:as/ubuntu_2404_warn_fix

Browse Source 
Warnings fix for Ubuntu 24.04.
This commit is contained in:
Alexander Smorkalov 2024-07-02 17:21:53 +03:00 committed by GitHub
commit fef2c95472
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/clapack/CMakeLists.txt vendored
View File

@ -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}

12
modules/3d/perf/perf_tsdf.cpp
View File

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

12
modules/3d/test/test_tsdf.cpp
View File

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