Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 9 Jul 2018 16:31:45 +0000 (19:31 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Mon, 9 Jul 2018 16:44:51 +0000 (19:44 +0300)
commit2da96be217ab437de854aca7f7670c2048fb554b
treefc865c0a7c646569f55d207a4b39aeb008413dc2
parent43f821afb91330958d4723f6300a5ec0bfa2185e
parent7fe0727930622c94a167f6a3e2a68ae69e4ee484
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
22 files changed:
doc/tutorials/features2d/akaze_matching/akaze_matching.markdown
modules/calib3d/src/calibinit.cpp
modules/calib3d/src/precomp.hpp
modules/core/include/opencv2/core/cvdef.h
modules/core/include/opencv2/core/utility.hpp
modules/core/src/arithm.cpp
modules/core/src/check.cpp
modules/core/src/count_non_zero.cpp
modules/core/src/opengl.cpp
modules/core/src/system.cpp
modules/features2d/src/fast.cpp
modules/imgproc/src/canny.cpp
modules/imgproc/src/corner.cpp
modules/imgproc/src/drawing.cpp
modules/imgproc/src/pyramids.cpp
modules/imgproc/src/smooth.cpp
modules/ml/src/ann_mlp.cpp
modules/ml/src/data.cpp
modules/ml/src/svm.cpp
modules/objdetect/src/cascadedetect.cpp
modules/video/src/lkpyramid.cpp
modules/videoio/src/videoio_registry.cpp