Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 2 Jul 2018 11:58:01 +0000 (14:58 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 2 Jul 2018 11:58:29 +0000 (14:58 +0300)
commit3165baa1f152878b49c984384aa61c430a686768
tree26286446a2d1f2e5f99d7a47b5ea74b04e7152e0
parent9a8a964b698b00f22229e1bef8f14f3e2f57a980
parent74da80dbda6b8d7da176fe8e5e3941661e6ec206
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
doc/tutorials/imgproc/imgtrans/distance_transformation/distance_transform.markdown
modules/calib3d/include/opencv2/calib3d.hpp
modules/objdetect/include/opencv2/objdetect.hpp
modules/video/src/lkpyramid.cpp