9c83f6c4fb
Conflicts: cmake/OpenCVDetectCUDA.cmake modules/core/include/opencv2/core/version.hpp modules/cudacodec/src/ffmpeg_video_source.cpp modules/gpu/src/video_writer.cpp modules/highgui/test/test_ffmpeg.cpp modules/highgui/test/test_video_io.cpp modules/highgui/test/test_video_pos.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/src/arithm.cpp modules/ocl/src/blend.cpp modules/ocl/src/canny.cpp modules/ocl/src/cl_operations.cpp modules/ocl/src/filtering.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/kmeans.cpp modules/ocl/src/moments.cpp modules/ocl/src/safe_call.hpp modules/ocl/src/split_merge.cpp modules/ocl/test/test_moments.cpp samples/ocl/squares.cpp |
||
---|---|---|
.. | ||
main.cpp | ||
test_api.cpp | ||
test_arithm.cpp | ||
test_bgfg.cpp | ||
test_blend.cpp | ||
test_brute_force_matcher.cpp | ||
test_calib3d.cpp | ||
test_canny.cpp | ||
test_color.cpp | ||
test_fft.cpp | ||
test_filters.cpp | ||
test_gemm.cpp | ||
test_hough.cpp | ||
test_imgproc.cpp | ||
test_kalman.cpp | ||
test_kmeans.cpp | ||
test_match_template.cpp | ||
test_matrix_operation.cpp | ||
test_mean_shift.cpp | ||
test_ml.cpp | ||
test_moments.cpp | ||
test_objdetect.cpp | ||
test_optflow.cpp | ||
test_precomp.hpp | ||
test_pyramids.cpp | ||
test_sort.cpp | ||
test_split_merge.cpp | ||
test_warp.cpp | ||
utility.cpp | ||
utility.hpp |