3c4b24d531
Conflicts: CMakeLists.txt modules/highgui/src/cap.cpp modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/color.cpp modules/ocl/src/gftt.cpp modules/ocl/src/imgproc.cpp samples/ocl/facedetect.cpp |
||
|---|---|---|
| .. | ||
| images | ||
| camera_calibration_and_3D_reconstruction.rst | ||
| data_structures.rst | ||
| feature_detection_and_description.rst | ||
| image_filtering.rst | ||
| image_processing.rst | ||
| introduction.rst | ||
| matrix_reductions.rst | ||
| ml_machine_learning.rst | ||
| object_detection.rst | ||
| ocl.rst | ||
| operations_on_matrices.rst | ||
| structures_and_utility_functions.rst | ||
| video_analysis.rst | ||