2c4bbb313c
Conflicts: cmake/OpenCVConfig.cmake cmake/OpenCVLegacyOptions.cmake modules/contrib/src/retina.cpp modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst modules/gpu/doc/video.rst modules/gpu/src/speckle_filtering.cpp modules/python/src2/cv2.cv.hpp modules/python/test/test2.py samples/python/watershed.py |
||
---|---|---|
.. | ||
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 |