mirror of
https://github.com/opencv/opencv.git
synced 2024-12-15 01:39:10 +08:00
2bbda9d225
Conflicts: modules/cudaimgproc/test/test_color.cpp modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp modules/gpu/perf/perf_imgproc.cpp modules/gpu/src/imgproc.cpp modules/gpu/test/test_core.cpp modules/gpu/test/test_imgproc.cpp modules/java/generator/src/cpp/VideoCapture.cpp samples/gpu/performance/CMakeLists.txt samples/tapi/CMakeLists.txt |
||
---|---|---|
.. | ||
ocl | ||
test_arithm.cpp | ||
test_countnonzero.cpp | ||
test_ds.cpp | ||
test_dxt.cpp | ||
test_eigen.cpp | ||
test_io.cpp | ||
test_main.cpp | ||
test_mat.cpp | ||
test_math.cpp | ||
test_misc.cpp | ||
test_operations.cpp | ||
test_precomp.hpp | ||
test_ptr.cpp | ||
test_rand.cpp | ||
test_umat.cpp |