mirror of
https://github.com/opencv/opencv.git
synced 2026-09-11 04:43:22 -05:00
Conflicts: modules/gpu/perf/perf_imgproc.cpp Cast a long integer to double explicitly. Conflicts: modules/python/src2/cv2.cpp Cast some matrix sizes to type int. Change some vector mask types to unsigned. Conflicts: modules/core/src/arithm.cpp