Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 3 Jun 2021 16:23:36 +0000 (16:23 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 3 Jun 2021 16:23:36 +0000 (16:23 +0000)
commit3e513ee6ab7a23ff5d498e3fb9518665777ed415
tree0f4693c36e6e0cbbbec29bc760e6b3327c925f36
parent0e8431d17b24ee2f0fee858fef30462268e1a8b9
parentc34445a496f82dbb0cff18feb44f78a82463f9c0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/include/opencv2/dnn/dnn.hpp
modules/highgui/src/window_gtk.cpp
modules/imgcodecs/src/grfmt_exr.cpp
modules/objdetect/src/hog.cpp