mirror of
https://github.com/opencv/opencv.git
synced 2024-12-30 13:08:18 +08:00
78be4f66f7
Conflicts: CMakeLists.txt modules/calib3d/src/calibration.cpp modules/ocl/src/cl_programcache.cpp modules/ocl/src/filtering.cpp modules/ocl/src/imgproc.cpp samples/ocl/adaptive_bilateral_filter.cpp samples/ocl/bgfg_segm.cpp samples/ocl/clahe.cpp samples/ocl/facedetect.cpp samples/ocl/pyrlk_optical_flow.cpp samples/ocl/squares.cpp samples/ocl/surf_matcher.cpp samples/ocl/tvl1_optical_flow.cpp |
||
---|---|---|
.. | ||
test_detectors.cpp | ||
test_features2d.cpp | ||
test_keypoints.cpp | ||
test_main.cpp | ||
test_precomp.hpp | ||
test_rotation_and_scale_invariance.cpp | ||
test_surf.cuda.cpp | ||
test_surf.ocl.cpp |