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

2019-12-31 10:11:39 +00:00
parent dec25e8531 bb93066558
commit 1996ae4a42
11 changed files with 83 additions and 40 deletions
@@ -26,7 +26,6 @@ import cv2 as cv

 import video
 from common import anorm2, draw_str
-from time import clock

 lk_params = dict( winSize  = (15, 15),
                  maxLevel = 2,
@@ -39,9 +39,6 @@ import re

 from numpy import pi, sin, cos

-# built-in modules
-from time import clock
-
 # local modules
 from tst_scene_render import TestSceneRender
 import common