mirror of
https://github.com/opencv/opencv.git
synced 2024-12-16 10:29:11 +08:00
b99f7a29df
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 |
||
---|---|---|
.. | ||
cv2.cpp | ||
gen2.py | ||
hdr_parser.py | ||
pycompat.hpp |