build: xcode 12 support

pull/2764/head
Alexander Alekhin 4 years ago
parent f63965759d
commit 89e856b3fa
  1. 2
      modules/intensity_transform/src/bimef.cpp
  2. 6
      modules/rgbd/src/submap.hpp
  3. 2
      modules/sfm/src/libmv_light/CMakeLists.txt

@ -234,7 +234,7 @@ static Mat solveLinearEquation(const Mat_<float>& img, Mat_<float>& W_h_, Mat_<f
}
);
return tout;
return std::move(tout);
}
static Mat_<float> tsmooth(const Mat_<float>& src, float lambda=0.01f, float sigma=3.0f, float sharpness=0.001f)

@ -499,7 +499,7 @@ PoseGraph SubmapManager<MatType>::MapToPoseGraph()
PoseGraph localPoseGraph;
for(const Ptr<SubmapT> 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<MatType>::MapToPoseGraph()
}
}
for(const Ptr<SubmapT> currSubmap : submapList)
for(const auto& currSubmap : submapList)
{
PoseGraphNode currNode(currSubmap->id, currSubmap->pose);
if(currSubmap->id == 0)
@ -530,7 +530,7 @@ PoseGraph SubmapManager<MatType>::MapToPoseGraph()
template <typename MatType>
void SubmapManager<MatType>::PoseGraphToMap(const PoseGraph &updatedPoseGraph)
{
for(const Ptr<SubmapT> currSubmap : submapList)
for(const auto& currSubmap : submapList)
{
const PoseGraphNode& currNode = updatedPoseGraph.nodes.at(currSubmap->id);
if(!currNode.isPoseFixed())

@ -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()

Loading…
Cancel
Save