Skip to content

Merge 3.4#19167

Merged
alalek merged 19 commits intoopencv:masterfrom
alalek:merge-3.4
Dec 18, 2020
Merged

Merge 3.4#19167
alalek merged 19 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Dec 18, 2020

#19104 from alalek:docs_cmake_msvs2019
#19105 from alalek:js_build_update
#19127 from asmorkalov:as/photo_fix_arm64
#19137 from VadimLevin:dev/vlevin/safe-string-conversion
#19152 from LupusSanctus:am/color_issue
#19154 from alalek:fixup_19089
#19158 from alalek:build_opencv_winpack_dldt_2021.2.0
#19161 from alalek:js_robust_code_generation
#19162 from alalek:backport_18985

Previous "Merge 3.4": #19153

Details
Xci_branch=merge-3.4
buildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript
buildworker:Custom=linux-4
Xbuild_image:Custom=javascript-simd:1.39.16
Xbuild_image:Custom=javascript-simd
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.4.0:16.04
#build_image:Custom=ubuntu-openvino-2021.1.0:20.04
#build_image:Custom=ubuntu-openvino-2021.2.0:20.04
#buildworker:Custom=linux-1
#build_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
#build_image:Custom=fedora:28
#build_image:Custom=ubuntu-cuda:16.04
#build_image:Custom=ubuntu-clang:18.04
#build_image:Custom=ubuntu:20.04
#buildworker:Custom=linux-1
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
#build_image:Custom Mac=openvino-2019r3.0
#build_image:Custom Mac=openvino-2020.3.0
Xbuild_image:Custom Mac=openvino-2020.4.0
Xbuild_image:Custom Mac=openvino-2021.1.0
build_image:Custom Mac=openvino-2021.2.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
Xbuild_image:Custom Win=openvino-2020.4.0
Xbuild_image:Custom Win=openvino-2021.1.0
build_image:Custom Win=openvino-2021.2.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
build_contrib:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

alalek and others added 19 commits December 14, 2020 04:42
- support modern Emscripten build process
- replaced Docker image
- replaced Emscripten's web URLs
 If provided `PyObject` can't be converted to string `TypeError` is
 reported instead of `SytemError` without any message.
- avoid randomized output due to unpredictable dict/set order
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Dec 18, 2020

👍

@alalek alalek merged commit dac298e into opencv:master Dec 18, 2020
@alalek alalek mentioned this pull request Dec 20, 2020
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.

4 participants