opencv

14569 Commits

6 Branches

128 Tags

3.0 GiB

Commit Graph

Author	SHA1	Message	Date
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
Roman Donchenko	86b841563b	Added tests for Ptr.	12 years ago

Author

SHA1

Message

Date

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

Roman Donchenko

86b841563b

Added tests for Ptr.

1 Commits (e0c8721830f7bca0873f40c9938e5af81e887e19)