Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Thu, 5 Dec 2019 14:29:22 +0000 (17:29 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Thu, 5 Dec 2019 15:27:45 +0000 (18:27 +0300)
commit8108fb0575e6470d92f744244064472a57056031
tree0e53ccfda67ef334155da2facffda9f84b2416b6
parentb4a3c92867e23573d1188d70c16be68ebf27555f
parentc790779a378427258a4b5bb9bbc0d8db67b9a965
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
14 files changed:
modules/calib3d/include/opencv2/calib3d.hpp
modules/calib3d/misc/java/test/Calib3dTest.java
modules/calib3d/src/calibration.cpp
modules/calib3d/src/solvepnp.cpp
modules/calib3d/test/test_cameracalibration.cpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/norm.cpp
modules/core/src/system.cpp
modules/dnn/src/dnn.cpp
modules/dnn/src/op_inf_engine.cpp
modules/dnn/src/op_inf_engine.hpp
modules/dnn/test/test_caffe_importer.cpp
modules/dnn/test/test_tf_importer.cpp
modules/python/src2/hdr_parser.py