Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 19 Jun 2021 18:36:27 +0000 (18:36 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 19 Jun 2021 18:44:16 +0000 (18:44 +0000)
commit735a79ae8305cd24c064e1719c197c2092611765
treeefd424e02e54efbb3f0338dcc1e9c579bd63de19
parent53eca2ff5b24a6088647632cb598d732fc582ce6
parentc2263db7bca24a6df70c062d895266c6ae10cb34
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/src/norm.cpp
modules/core/test/test_arithm.cpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/features2d/include/opencv2/features2d.hpp
modules/features2d/src/draw.cpp
modules/highgui/src/window_gtk.cpp