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 |
||
|---|---|---|
| .. | ||
| doc/pics | ||
| include/opencv2 | ||
| misc/java/test | ||
| perf | ||
| src | ||
| test | ||
| CMakeLists.txt | ||