mirror of
https://github.com/opencv/opencv.git
synced 2024-11-28 21:20:18 +08:00
4f1aed98de
Conflicts: .gitignore modules/contrib/src/detection_based_tracker.cpp modules/core/include/opencv2/core/core.hpp modules/core/include/opencv2/core/internal.hpp modules/core/src/gpumat.cpp modules/core/src/opengl.cpp modules/gpu/src/cuda/safe_call.hpp modules/highgui/src/cap.cpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/ocl/doc/image_processing.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_haar.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/kmeans.cpp modules/ocl/src/svm.cpp modules/ocl/test/test_objdetect.cpp samples/ocl/adaptive_bilateral_filter.cpp |
||
---|---|---|
.. | ||
android_binary_package | ||
crosscompilation | ||
desktop_java | ||
display_image | ||
how_to_write_a_tutorial | ||
ios_install | ||
java_eclipse | ||
linux_eclipse | ||
linux_gcc_cmake | ||
linux_install | ||
load_save_image | ||
table_of_content_introduction | ||
windows_install | ||
windows_visual_studio_image_watch | ||
windows_visual_studio_Opencv |