Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 7 Jun 2019 16:02:55 +0000 (19:02 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Fri, 7 Jun 2019 16:02:55 +0000 (19:02 +0300)
commitddcf3882704942ee79f5f5ff06e2eec678ee8262
tree00db1ff0498f02e1d351497bd7eaf5fbca6e1604
parentf3de2b4be75c120e2c3c59a89d6f1453ee055166
parent254f88f80591f85bfa29f664f6d9eb64115a8a9d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
21 files changed:
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/src/fundam.cpp
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/core_c.h
modules/core/include/opencv2/core/cvdef.h
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/optim.hpp
modules/core/src/datastructs.cpp
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/misc/java/gen_dict.json
modules/java/generator/gen_java.py
modules/ml/include/opencv2/ml.hpp
modules/objdetect/src/qrcode.cpp
modules/photo/src/inpaint.cpp
modules/python/src2/cv2.cpp
modules/python/src2/hdr_parser.py
modules/video/src/lkpyramid.cpp
modules/videoio/include/opencv2/videoio.hpp
platforms/android/build_sdk.py