Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 13 Apr 2020 20:00:12 +0000 (20:00 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 13 Apr 2020 20:00:12 +0000 (20:00 +0000)
commitca9756f6a1ea25a232d83d768f833b4fa3ee4cf4
treebd62fa536355520212d090cd9707f0081913e83c
parentf351653589d823ab3234469cbaa285168dffedaa
parent675342ecd92b3921dc374608095b0b2ab0c21c46
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/mat.inl.hpp
modules/core/test/test_mat.cpp
modules/dnn/src/layers/permute_layer.cpp
modules/dnn/src/onnx/onnx_graph_simplifier.cpp
modules/dnn/src/onnx/onnx_graph_simplifier.hpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/imgcodecs/src/grfmt_pxm.cpp
samples/cpp/tutorial_code/ImgProc/anisotropic_image_segmentation/anisotropic_image_segmentation.cpp