diff --git a/modules/intensity_transform/src/bimef.cpp b/modules/intensity_transform/src/bimef.cpp index 58eac6002af..72555ed9773 100644 --- a/modules/intensity_transform/src/bimef.cpp +++ b/modules/intensity_transform/src/bimef.cpp @@ -234,7 +234,7 @@ static Mat solveLinearEquation(const Mat_& img, Mat_& W_h_, Mat_ tsmooth(const Mat_& src, float lambda=0.01f, float sigma=3.0f, float sharpness=0.001f) diff --git a/modules/rgbd/src/submap.hpp b/modules/rgbd/src/submap.hpp index 983ee610c75..65a2bed6229 100644 --- a/modules/rgbd/src/submap.hpp +++ b/modules/rgbd/src/submap.hpp @@ -499,7 +499,7 @@ PoseGraph SubmapManager::MapToPoseGraph() PoseGraph localPoseGraph; - for(const Ptr currSubmap : submapList) + for(const auto& currSubmap : submapList) { const typename SubmapT::Constraints& constraintList = currSubmap->constraints; for(const auto& currConstraintPair : constraintList) @@ -512,7 +512,7 @@ PoseGraph SubmapManager::MapToPoseGraph() } } - for(const Ptr currSubmap : submapList) + for(const auto& currSubmap : submapList) { PoseGraphNode currNode(currSubmap->id, currSubmap->pose); if(currSubmap->id == 0) @@ -530,7 +530,7 @@ PoseGraph SubmapManager::MapToPoseGraph() template void SubmapManager::PoseGraphToMap(const PoseGraph &updatedPoseGraph) { - for(const Ptr currSubmap : submapList) + for(const auto& currSubmap : submapList) { const PoseGraphNode& currNode = updatedPoseGraph.nodes.at(currSubmap->id); if(!currNode.isPoseFixed()) diff --git a/modules/sfm/src/libmv_light/CMakeLists.txt b/modules/sfm/src/libmv_light/CMakeLists.txt index aee38c68184..0a1549ab986 100644 --- a/modules/sfm/src/libmv_light/CMakeLists.txt +++ b/modules/sfm/src/libmv_light/CMakeLists.txt @@ -7,7 +7,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS -Winconsistent-missing-override -Wsuggest-o if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 8.0) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wclass-memaccess) endif() -if(CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0) +if((CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0) OR CV_CLANG) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wdeprecated-copy) endif()