Skip to content

Merge 3.4#19593

Merged
alalek merged 28 commits intoopencv:masterfrom
alalek:merge-3.4
Feb 21, 2021
Merged

Merge 3.4#19593
alalek merged 28 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Feb 21, 2021

#19417 from LupusSanctus:am/text_graph_identity
#19474 from aryanshomray:darknet_tanh
#19498 from mattalvarado:fix_findcirclesgrid
#19519 from alalek:issue_19485
#19520 from WeiChungChang:refine
#19521 from zchrissirhcz:3.4-fix-core-module-android-arm64-build
#19522 from zchrissirhcz:3.4-fix-android-find-zlib-shared-since-ndk19
#19525 from danbey:Fix-cppcheck-error-in-carotete-lib
#19532 from amirtu:OCV-166_getDefaultName_overload (partially moved to contrib)
#19534 from tomoaki0705:fixCudaFiltersRace (moved to contrib)
#19541 from alalek:core_includes
#19543 from alalek:hotfix_19439
#19550 from Nico769:patch-1
#19559 from APrigarina:calib3d_fix
#19580 from SergeyKrivohatskiy:patch-1
#19582 from alalek:backport_19572
#19586 from larryw3i:patch-2

Previous "Merge 3.4": #19517

Details
buildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4,linux-6
#buildworker:Docs=linux-4,linux-6
#build_image:Docs=docs-js
build_image:Custom=javascript
buildworker:Custom=linux-4,linux-6
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

Qoo and others added 28 commits February 12, 2021 20:53
…-android-arm64-build

* fix core module android arm64 build

* fix core module android build when neon is off

When building for Android ARM platform, cmake with
`-D CV_DISABLE_OPTIMIZATION=ON`, the expected behavior is
not using ARM NEON, using naive computation instead.

This commit fix the un-expected compile error for neon intrinsincs.
…d-zlib-shared-since-ndk19

* fix find zlib.so instead of zlib.a when NDK >= 19

On Android platform, `libopencv_imgcodecs.a` is built, expected to
depend on `libz.so`. However, since Android NDK r19, NDK's `libz.a`
is found instead of `libz.so`, leading to link error
(not found libz.a) on machines without same NDK version & direcotry.

Since Android NDK-r19, toolchain pieces are installed to
`$NDK/toolchains/llvm/prebuilt/<host-tag>/...`, including `libz.so`.
Also installed to old paths (`<NDK>/platforms` and `<NDK>/sysroot`)
in NDK r19, r20, r21, but since NDK 22, old paths are removed.

- https://github.com/android/ndk/wiki/Changelog-r19
- https://github.com/android/ndk/wiki/Changelog-r22

With this commit, `libz.so` can be correctly found in NDK<19 and NDK>=19.

`ZLIB_LIBRARIES` is also simplified as `z`, by appending match (regex)
patterns for new toolchain installation directory's libz.so's paths.

* simplify libz.so match pattern for abbreviation
…otete-lib

* Reduce if statement as it has the same expression on both sides of '&&'

If statement has the same expression on both sides so this can be reduce

Signed-off-by: Dan Ben Yosef <danbey@gmail.com>

* The if statement is to check width and height
* Properly handle empty centers in findCirclesGrid

* Address alalek comments. Add unit test to validate bugfix

* fix build warnings, remove unrelated comment
* Corrected SSD text graph generation for Identity nodes

* Added minor code corrections
- follows iso c++ guideline C.44
- enables default compiler-created constructors to
  also be noexcept

original commit: 77e26a7

- handled KernelArg, Image2D
* Fixed OCL implementation of pyrlk

If prevPts size is (N, 1) (which is a default layout for converting `vector<Point2f>` to `UMat`) the `prevPts.cols == 1` and optical flow will be calculated for the first point only.
Getting `prevPts.total()` as in line 1048 is the correct way to get points count.

* fixed compilation warning (size_t to int)

Signed-off-by: Sergey Krivohatskiy <s.krivohatskiy@gmail.com>
* Update py_setup_in_ubuntu.markdown
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Feb 21, 2021

👍

@alalek alalek merged commit 0a6f216 into opencv:master Feb 21, 2021
@alalek alalek mentioned this pull request Feb 27, 2021
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.