mirror of
https://github.com/opencv/opencv.git
synced 2024-11-26 20:20:20 +08:00
4036f6a3d0
Conflicts: apps/CMakeLists.txt modules/contrib/CMakeLists.txt modules/core/include/opencv2/core/version.hpp modules/imgproc/include/opencv2/imgproc/imgproc.hpp modules/java/generator/gen_java.py modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/src/cl_runtime/cl_runtime.cpp modules/ocl/src/columnsum.cpp modules/ocl/src/filtering.cpp modules/ocl/src/imgproc.cpp modules/ocl/test/main.cpp modules/ocl/test/test_color.cpp modules/ocl/test/test_imgproc.cpp samples/gpu/CMakeLists.txt |
||
|---|---|---|
| .. | ||
| 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 | ||