Skip to content

(4.x) Merge 3.4#21981

Merged
opencv-pushbot merged 32 commits intoopencv:4.xfrom
opencv-pushbot:merge-3.4
May 14, 2022
Merged

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

Conversation

@opencv-pushbot
Copy link
Copy Markdown
Contributor

@opencv-pushbot opencv-pushbot commented May 14, 2022

#21847 from lamm45:imgproc-tform-doc
#21871 from xiongzhen:apply-predictor-to-lzw-only
#21882 from duanqn:improve-doc
#21916 from chenjunnn:patch-1
#21917 from asenyaev:asen/self_hosted_runner_linux_3.4
#21924 from fengyuentau:workflow_arm64_3.4
#21933 from Yulv-git:3.4-typos1
#21935 from Yulv-git:3.4-typos3
#21943 from vrabaud:3.4_proc
#21954 from Darkyenus:patch-1
#21963 from hellodoge:imwrite_fix
#21964 from Julian-Sz:patch-1
#21970 from asenyaev:asen/filtering_tests_3.4
#21974 from cxcorp:fix-js-test-globals
#21975 from asenyaev:asen/fix_terminating_windows_actions
#21977 from asenyaev:asen/win_contrib
#21980 from asenyaev:asen/move_variables_to_the_host

Previous "Merge 3.4": #21936

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

lamm45 and others added 30 commits April 10, 2022 13:13
* Fix compilation with non glibc.

_SC_NPROCESSORS_ONLN is non standard as defined on https://man7.org/linux/man-pages/man3/sysconf.3.html
It seems to only be on glibc, cf https://www.gnu.org/software/libc/manual/html_node/Processor-Resources.html

* Fix to defined(_SC_NPROCESSORS_ONLN)
3rdparty/libjpeg-turbo/src/jpeglib.h:
`* NB: you must set up the error-manager BEFORE calling jpeg_create_xxx.`
It was previously not clear that the extension should include the period, [and I am not the only person that encountered this problem](https://stackoverflow.com/questions/4254460/opencv-could-not-find-encoder-for-the-specified-extension).

I assume that this is true for all supported extensions, but I haven't checked the source.
In test_imgproc.js, the test_filter suite's last test assigns a variable
to `size` without declaring it with `let`, polluting the global scope.
This commit adds `let` to the statement, so that the variable is scoped
to the test block.
If there will be measurement before the next predict, `statePost` would be assigned to updated value. So I guess these steps are meant to handle when no measurement and KF only do the predict step.
```cpp
statePre.copyTo(statePost);
errorCovPre.copyTo(errorCovPost);
```
…_linux_3.4

Workflow to use a self-hosted Github runner on Linux x86_64 for 3.4 branch

* Changed a workflow to use a self-hosted Github runner for 3.4 branch
Minor documentation fixes for geometric image transformations
…-only

TIFFTAG_PREDICTOR should not be applied unless LZW, DEFLATE or ADOBE_DEFLATE
Workflow to build and test on ARM64 for 3.4 branch

* add ARM64 workflow for 3.4

* add opencv_contrib fork check

* rename RET to OPENCV_EXTRA_FORK
Documentation Fix: Python and Java switched in Explanation
@opencv-pushbot opencv-pushbot self-assigned this May 14, 2022
@opencv-pushbot opencv-pushbot merged commit d9a444c into opencv:4.x May 14, 2022
@opencv-pushbot opencv-pushbot deleted the merge-3.4 branch May 15, 2022 09:30
@alalek alalek mentioned this pull request May 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.