Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 17 Jul 2018 16:26:50 +0000 (19:26 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 17 Jul 2018 16:27:48 +0000 (19:27 +0300)
commit4560909a5e5cb284cdfd5619cdf4cf3622410388
tree0145bb69b66bdbcdbef9257b2f9562a9f34b8959
parent3f65924c4547c4eafaba83c1befc6425876c6d9f
parent6c4f618db5d6dd329ae1a3693e2dc02c8de20e68
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
22 files changed:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
cmake/OpenCVDetectInferenceEngine.cmake
doc/tutorials/core/basic_linear_transform/basic_linear_transform.markdown
doc/tutorials/ml/introduction_to_pca/introduction_to_pca.markdown
doc/tutorials/ml/introduction_to_svm/introduction_to_svm.markdown
doc/tutorials/ml/non_linear_svms/non_linear_svms.markdown
modules/calib3d/misc/java/gen_dict.json
modules/calib3d/src/calibinit.cpp
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/cvdef.h
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/mat.inl.hpp
modules/core/include/opencv2/core/matx.hpp
modules/core/src/arithm.cpp
modules/core/src/check.cpp
modules/imgproc/src/deriv.cpp
modules/imgproc/src/drawing.cpp
modules/imgproc/src/smooth.cpp
modules/ml/src/rtrees.cpp
modules/objdetect/include/opencv2/objdetect.hpp
modules/ts/src/ts_func.cpp