Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorOpenCV Developers <dev@opencv.org>
Sat, 16 Apr 2022 14:41:15 +0000 (14:41 +0000)
committerOpenCV Developers <dev@opencv.org>
Sat, 16 Apr 2022 14:41:15 +0000 (14:41 +0000)
commit2985739b8c3b129c9505443491d2230f6d22d507
tree272c26dfebc65990651940e3eb98512a99edc1c1
parent556d211136134a1444279e6c832fb5c4a69be64b
parent2465d9333036d9bd63dee64bad27b98e8bc5578e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/dnn/src/tensorflow/tf_graph_simplifier.cpp
modules/dnn/test/test_tf_importer.cpp
modules/imgcodecs/include/opencv2/imgcodecs.hpp
modules/imgproc/test/test_filter.cpp