Open Source Computer Vision Library https://opencv.org/

Tree: 1036ce807c

opencv/modules/python

History

Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename ... Conflicts: modules/core/include/opencv2/core/cuda.hpp modules/cudacodec/src/thread.cpp modules/cudacodec/src/thread.hpp modules/superres/perf/perf_superres.cpp modules/superres/src/btv_l1_cuda.cpp modules/superres/src/optical_flow.cpp modules/videostab/src/global_motion.cpp modules/videostab/src/inpainting.cpp samples/cpp/stitching_detailed.cpp samples/cpp/videostab.cpp samples/gpu/stereo_multi.cpp		12 years ago
..
src2	Merge branch 'master' into gpu-cuda-rename	12 years ago
test	Merge commit '43aec5ad' into merge-2.4	12 years ago
CMakeLists.txt	Refactored NumPy detection.	12 years ago