mirror of
https://github.com/zebrajr/opencv.git
synced 2025-12-07 12:19:55 +01:00
Conflicts: modules/imgproc/src/opencl/integral_sqrsum.cl modules/nonfree/doc/feature_detection.rst modules/nonfree/include/opencv2/nonfree/ocl.hpp modules/nonfree/src/surf_ocl.cpp modules/nonfree/test/test_features2d.cpp modules/ocl/doc/image_processing.rst modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_imgproc.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/match_template.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/src/opencl/haarobjectdetect_scaled2.cl modules/ocl/test/test_imgproc.cpp |
||
|---|---|---|
| .. | ||
| android_binary_package | ||
| clojure_dev_intro | ||
| 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 | ||