f77c68e0fa
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 |
||
---|---|---|
.. | ||
adding_images | ||
basic_geometric_drawing | ||
basic_linear_transform | ||
discrete_fourier_transform | ||
file_input_output_with_xml_yml | ||
how_to_scan_images | ||
interoperability_with_OpenCV_1 | ||
mat_the_basic_image_container | ||
mat-mask-operations | ||
random_generator_and_text | ||
table_of_content_core |