Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 28 May 2018 11:22:55 +0000 (11:22 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 28 May 2018 11:22:55 +0000 (11:22 +0000)
commit0f298a42032798d2d83017030621fcba885a3372
treec16a53c1d04a0cc4f30b1a66a2e5d4bf2730623f
parent5e68f35500a859838ab8688bd3487cf9edece3f7
parent06c1890639cad7060150ecc3dc6cc24d067d1f38
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/calib3d/src/calibinit.cpp
modules/core/include/opencv2/core/cvdef.h
modules/imgproc/include/opencv2/imgproc.hpp
modules/videoio/src/cap.cpp