Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorOpenCV Developers <dev@opencv.org>
Sat, 14 May 2022 11:21:33 +0000 (11:21 +0000)
committerOpenCV Developers <dev@opencv.org>
Sat, 14 May 2022 11:23:21 +0000 (11:23 +0000)
commitd9a444ca1a97740f9d092816a0ad0a523482911f
treee4fb4c71822e7451e6fe66a651e1c74fa551f193
parent8d0fbc6a1e9f20c822921e8076551a01e58cd632
parent766f58ed7e333f2be012de37ccd60e2c85ce0a47
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
17 files changed:
.github/workflows/PR-4.x-ARM64.yaml
.github/workflows/PR-4.x-U20.yaml
.github/workflows/PR-4.x-W10.yaml
doc/js_tutorials/js_setup/js_nodejs/js_nodejs.markdown
doc/tutorials/imgproc/imgtrans/hough_circle/hough_circle.markdown
doc/tutorials/imgproc/morph_lines_detection/morph_lines_detection.md
modules/core/include/opencv2/core/mat.hpp
modules/core/src/parallel.cpp
modules/imgcodecs/include/opencv2/imgcodecs.hpp
modules/imgcodecs/src/grfmt_jpeg.cpp
modules/imgcodecs/src/grfmt_tiff.cpp
modules/imgcodecs/test/test_tiff.cpp
modules/imgproc/include/opencv2/imgproc.hpp
modules/imgproc/test/test_convhull.cpp
modules/js/test/test_imgproc.js
modules/videoio/src/cap_gstreamer.cpp
modules/videoio/test/test_video_io.cpp