Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 28 May 2019 16:41:48 +0000 (19:41 +0300)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 28 May 2019 18:29:48 +0000 (18:29 +0000)
commit43467a2ac77207afd7bbc348e63d89692f838ad6
tree749eacaad1ad821ec648930cadfbad9528688afe
parented96864892db6d9cf2a5cf22f76f06422fcf3ab6
parent0d477d736481288280867686cb26cc2cba7c659f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
19 files changed:
CMakeLists.txt
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/misc/java/gen_dict.json
modules/calib3d/misc/java/test/Calib3dTest.java
modules/calib3d/src/calibration.cpp
modules/calib3d/src/solvepnp.cpp
modules/calib3d/src/undistort.cpp
modules/calib3d/test/test_cameracalibration.cpp
modules/calib3d/test/test_undistort.cpp
modules/calib3d/test/test_undistort_badarg.cpp
modules/dnn/include/opencv2/dnn/all_layers.hpp
modules/dnn/src/dnn.cpp
modules/dnn/test/test_backends.cpp
modules/imgcodecs/src/grfmt_tiff.cpp
modules/js/src/core_bindings.cpp
modules/js/src/embindgen.py
modules/objdetect/misc/java/test/CascadeClassifierTest.java
modules/videoio/src/cap_dshow.cpp
modules/videoio/src/cap_images.cpp