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 | ||