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 remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-10 00:04:29 +03:00
parent 80610ca054 c35c5a47df
commit dca657a2fd
107 changed files with 492 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/features2d/src/blobdetector.cpp
+1 -1
View File
@@ -193,7 +193,7 @@ void SimpleBlobDetectorImpl::findBlobs(InputArray _image, InputArray _binaryImag
CV_INSTRUMENT_REGION()
Mat image = _image.getMat(), binaryImage = _binaryImage.getMat();
(void)image;
CV_UNUSED(image);
centers.clear();
std::vector < std::vector<Point> > contours;
modules/features2d/src/orb.cpp
+1 -1
View File
@@ -779,7 +779,7 @@ static void computeKeyPoints(const Mat& imagePyramid,
bool useOCL, int fastThreshold )
{
#ifndef HAVE_OPENCL
(void)uimagePyramid;(void)ulayerInfo;(void)useOCL;
CV_UNUSED(uimagePyramid);CV_UNUSED(ulayerInfo);CV_UNUSED(useOCL);
#endif
int i, nkeypoints, level, nlevels = (int)layerInfo.size();