Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 9 Jun 2021 10:58:37 +0000 (10:58 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 9 Jun 2021 10:58:37 +0000 (10:58 +0000)
1  2 
modules/core/include/opencv2/core/types_c.h
modules/python/package/cv2/__init__.py