Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2018-09-15 00:52:21 +03:00
committed by Alexander Alekhin
235 changed files with 18422 additions and 3526 deletions

View File

@@ -72,10 +72,11 @@ class PointPolygonTest {
}
}
drawing.put(0, 0, drawingData);
Imgproc.circle(drawing, res.maxLoc, (int)res.maxVal, new Scalar(255, 255, 255), 2, 8, 0);
/// Show your results
HighGui.imshow("Source", src);
HighGui.imshow("Distance", drawing);
HighGui.imshow("Distance and inscribed circle", drawing);
HighGui.waitKey();
System.exit(0);