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

2019-03-22 19:31:31 +03:00
parent f147ba16e2 b82ecaf48c
commit 8c25a8eb7b
67 changed files with 1221 additions and 682 deletions
@@ -48,9 +48,7 @@ def make_image():
        cv.ellipse( img, (dx+273, dy+100), (20,35), 0, 0, 360, white, -1 )
    return img

-if __name__ == '__main__':
-    print(__doc__)
-
+def main():
    img = make_image()
    h, w = img.shape[:2]

@@ -67,4 +65,10 @@ if __name__ == '__main__':
    cv.createTrackbar( "levels+3", "contours", 3, 7, update )
    cv.imshow('image', img)
    cv.waitKey()
+    print('Done')
+
+
+if __name__ == '__main__':
+    print(__doc__)
+    main()
    cv.destroyAllWindows()