Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 6 Mar 2020 20:00:55 +0000 (20:00 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 6 Mar 2020 20:41:30 +0000 (20:41 +0000)
commit619180dffdfeb0f72c69a3ef7d1f53fe4435b650
tree5fb30253bea277f3b3bcf23a00bb74ebc506647d
parent6271192a3298e3237fa7e6c498686a8454e67e0e
parent6d113bd03f72b77d1fe1a64246f176c7de9f576c
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
18 files changed:
modules/core/include/opencv2/core/cvstd.inl.hpp
modules/core/src/norm.cpp
modules/core/src/ocl.cpp
modules/dnn/src/layers/blank_layer.cpp
modules/dnn/src/layers/const_layer.cpp
modules/dnn/src/layers/flatten_layer.cpp
modules/dnn/src/layers/normalize_bbox_layer.cpp
modules/dnn/src/layers/permute_layer.cpp
modules/dnn/src/layers/pooling_layer.cpp
modules/dnn/src/layers/prior_box_layer.cpp
modules/dnn/src/layers/reorg_layer.cpp
modules/dnn/src/layers/reshape_layer.cpp
modules/dnn/src/layers/resize_layer.cpp
modules/dnn/src/layers/scale_layer.cpp
modules/dnn/src/layers/slice_layer.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/imgcodecs/src/grfmt_jpeg.cpp