potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #18924 from alalek:4.x-xcode12

Browse Source 
(4.x) build: Xcode 12 support

* build: xcode 12 support, cmake fixes

* ts: eliminate clang 11 warnigns

* 3rdparty: clang 11 warnings

* features2d: eliminate build warnings

* test: warnings

* gapi: warnings from 18928
This commit is contained in:
Alexander Alekhin
2020-11-27 01:56:59 +03:00
committed by GitHub
parent 3c9d03c36f
commit 5c987e4c75
11 changed files with 115 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/src/evaluation.cpp
+1 -1
View File
@@ -314,7 +314,7 @@ struct SIdx
UsedFinder(const SIdx& _used) : used(_used) {}
const SIdx& used;
bool operator()(const SIdx& v) const { return (v.i1 == used.i1 || v.i2 == used.i2); }
UsedFinder& operator=(const UsedFinder&);
UsedFinder& operator=(const UsedFinder&) = delete;
};
};
modules/features2d/src/keypoint.cpp
+1 -1
View File
@@ -151,7 +151,7 @@ public:
private:
const Mat mask;
MaskPredicate& operator=(const MaskPredicate&);
MaskPredicate& operator=(const MaskPredicate&) = delete;
};
void KeyPointsFilter::runByPixelsMask( std::vector<KeyPoint>& keypoints, const Mat& mask )