Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 31 Jul 2018 18:35:00 +0000 (21:35 +0300)
committerAlexander Alekhin <alexander.alekhin@intel.com>
Tue, 31 Jul 2018 18:35:00 +0000 (21:35 +0300)
commit82c477c9f7d5a2cc6f70b51d61584a2dca605c8c
tree5a84e91c909e6597108be3005755718ab01f2180
parent57bead3a5e385d62068f4197001ca7e28b28d6e8
parent67f79aabddd882929bc0998c3cf9b2e238d511b9
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
CMakeLists.txt
modules/core/include/opencv2/core/utility.hpp
modules/core/src/arithm.cpp
modules/core/src/system.cpp
modules/core/test/test_arithm.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/ts/include/opencv2/ts/ts_perf.hpp