Skip to content

(4.x) Merge 3.4#21878

Merged
opencv-pushbot merged 11 commits intoopencv:4.xfrom
opencv-pushbot:merge-3.4
Apr 16, 2022
Merged

(4.x) Merge 3.4#21878
opencv-pushbot merged 11 commits intoopencv:4.xfrom
opencv-pushbot:merge-3.4

Conversation

@opencv-pushbot
Copy link
Copy Markdown
Contributor

@opencv-pushbot opencv-pushbot commented Apr 16, 2022

#21779 from eplankin:fix_11303
#21820 from alalek:fix_videoio_ffmpeg_memory_leak_3.4
#21821 from alalek:update_zlib
#21855 from opencv-pushbot:dnn_test_update_checks_face_detector_3.4
#21861 from rogday:21852_fix
#21873 from asmorkalov:as/jpeg_options

Previous "Merge 3.4": #21809

build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-f1

alalek and others added 11 commits April 4, 2022 18:52
* 3rdparty: zlib 1.2.11 => 1.2.12

https://github.com/madler/zlib/releases/tag/v1.2.12

* 3rdparty(zlib): re-apply patch 20190330-ununitialized-use-state-check.diff
Fixed out-of-bounds read in parallel version of ippGaussianBlur()

* Fixed out-of-memory read in parallel version of ippGaussianBlur()

* Fixed check

* Revert changes in CMakeLists.txt
Add assert to address tf simplifier security concerns
@opencv-pushbot opencv-pushbot self-assigned this Apr 16, 2022
@opencv-pushbot opencv-pushbot merged commit 2985739 into opencv:4.x Apr 16, 2022
@opencv-pushbot opencv-pushbot mentioned this pull request Apr 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants