Skip to content

(4.x) build: Xcode 12 support #2764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2020
Merged

(4.x) build: Xcode 12 support #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/intensity_transform/src/bimef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions modules/rgbd/src/submap.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion modules/sfm/src/libmv_light/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down