Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 1 Sep 2020 20:59:00 +0000 (20:59 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 1 Sep 2020 20:59:00 +0000 (20:59 +0000)
commit0428dce27d83c529781d0c244e96d7e28cd47ced
tree1bc6e6716c904c5d9bd84fe151ded356a9e17d76
parent60354e39018ac82d230d0d021cdc77343fc84ee8
parentf9fbd29c14f6e68cbb5ac6a858b8e26f986b0260
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/src/ocl.cpp
modules/features2d/src/orb.cpp
modules/flann/include/opencv2/flann/kmeans_index.h
modules/flann/src/miniflann.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/test/test_imgwarp.cpp
samples/cpp/tutorial_code/ImgProc/anisotropic_image_segmentation/anisotropic_image_segmentation.cpp