From b4b4d212120fd5dae3a9c85d81fad4b5166ba4ba Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 26 Mar 2020 19:05:07 +0000 Subject: [PATCH] eliminate build warnings --- modules/calib3d/src/chessboard.cpp | 9 --------- modules/calib3d/src/chessboard.hpp | 2 -- modules/core/src/parallel.cpp | 3 +++ modules/dnn/CMakeLists.txt | 1 + 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/modules/calib3d/src/chessboard.cpp b/modules/calib3d/src/chessboard.cpp index f72802880a..dbc47722cb 100644 --- a/modules/calib3d/src/chessboard.cpp +++ b/modules/calib3d/src/chessboard.cpp @@ -797,15 +797,6 @@ Ellipse::Ellipse(const cv::Point2f &_center, const cv::Size2f &_axes, float _ang { } -Ellipse::Ellipse(const Ellipse &other) -{ - center = other.center; - axes= other.axes; - angle= other.angle; - cosf = other.cosf; - sinf = other.sinf; -} - const cv::Size2f &Ellipse::getAxes()const { return axes; diff --git a/modules/calib3d/src/chessboard.hpp b/modules/calib3d/src/chessboard.hpp index 58c3b79043..4c862eca4c 100644 --- a/modules/calib3d/src/chessboard.hpp +++ b/modules/calib3d/src/chessboard.hpp @@ -111,8 +111,6 @@ class Ellipse public: Ellipse(); Ellipse(const cv::Point2f ¢er, const cv::Size2f &axes, float angle); - Ellipse(const Ellipse &other); - void draw(cv::InputOutputArray img,const cv::Scalar &color = cv::Scalar::all(120))const; bool contains(const cv::Point2f &pt)const; diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp index 2fcf491ba6..1925a10a72 100644 --- a/modules/core/src/parallel.cpp +++ b/modules/core/src/parallel.cpp @@ -95,6 +95,9 @@ */ #if defined HAVE_TBB + #ifndef TBB_SUPPRESS_DEPRECATED_MESSAGES // supress warning + #define TBB_SUPPRESS_DEPRECATED_MESSAGES 1 + #endif #include "tbb/tbb.h" #include "tbb/task.h" #include "tbb/tbb_stddef.h" diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt index 85631a98f5..27ecd142fb 100644 --- a/modules/dnn/CMakeLists.txt +++ b/modules/dnn/CMakeLists.txt @@ -122,6 +122,7 @@ endif() ocv_module_include_directories(${include_dirs}) if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") ocv_append_source_files_cxx_compiler_options(fw_srcs "-Wno-suggest-override") # GCC + ocv_append_source_files_cxx_compiler_options(fw_srcs "-Wno-array-bounds") # GCC 9.3.0 (Ubuntu 20.04) elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ocv_append_source_files_cxx_compiler_options(fw_srcs "-Wno-inconsistent-missing-override") # Clang endif()