Skip to content

(4.x) Merge 3.4#19637

Merged
alalek merged 22 commits intoopencv:masterfrom
alalek:merge-3.4
Feb 27, 2021
Merged

(4.x) Merge 3.4#19637
alalek merged 22 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Feb 27, 2021 •
edited
Loading

#19503 from komakai:fix-android-putget
#19529 from WeiChungChang:3.4
#19535 from alalek:issue_18897
#19536 from WeiChungChang:ReduceMemory
#19552 from WeiChungChang:partialSort
#19564 from sturkmen72:patch-4
#19601 from alalek:hotfix_19536
#19603 from federicohml:fix-ub-copy-make-const-border-8u
#19625 from mshabunin:static-analysis-issues-34 (backport)
#19628 from alalek:fix_19566
#19631 from prittt:sota-ccl
#19636 from LaurentBerger:blendlinear_py

Previous "Merge 3.4": #19593

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:18.04
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 22 commits February 15, 2021 20:14
save allocation of memory for fake image
bc87277
@komakai
Fix/optimize Android put/get functions
5cf08b0
@alalek
core(InputArray): replace STD_ARRAY to MATX
309e1e2 
- remove duplication kind
@sturkmen72
Update python samples
9b399f3
Merge pull request opencv#19552 from WeiChungChang:partialSort
f6bc4fd 
apply partial sort to save computations

* apply partial sort

* fix typo

* fix accroding to CR
@alalek
Merge pull request opencv#19564 from sturkmen72:patch-4
1de02b9
@alalek
Merge pull request opencv#19536 from WeiChungChang:ReduceMemory
513f5a8
@alalek
dnn: fix build (nullptr issue)
86cb435
@alalek
Merge pull request opencv#19601 from alalek:hotfix_19536
34d5746
Merge pull request opencv#19529 from WeiChungChang:3.4
d4d1216 
* improve map allocation check

* fix accoring to CR
@alalek
Merge pull request opencv#19535 from alalek:issue_18897
7ffc4b5
@alalek
Merge pull request opencv#19503 from komakai:fix-android-putget
67b6ef4
@mshabunin
Fixed several issues found by static analysis
b232157
@alalek
Merge pull request opencv#19625 from mshabunin:static-analysis-issues-34
20a46b3
@alalek
imgproc(warpAffine): avoid buffer indexes overflow in SIMD code
fadb25b
@alalek
Fix UB in CopyMakeConstBoder_8u
773262b 
Caused by overflow of arithmetic operators conversion rank
@alalek
Merge pull request opencv#19628 from alalek:fix_19566
1a855fe
@LaurentBerger
python binding blendLinear
84080c1
@prittt
Merge pull request opencv#19631 from prittt:sota-ccl
9695165 
* Add Spaghetti algorithm for CCL

* Add stat tests for new and old algorithms

* Switch license header to short version
@alalek
Merge pull request opencv#19636 from LaurentBerger:blendlinear_py
b3b80f8
@alalek
Merge pull request opencv#19603 from federicohml:fix-ub-copy-make-con…
19f1bac 
…st-border-8u
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
e0265c6
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Feb 27, 2021

👍

@alalek alalek merged commit e0265c6 into opencv:master Feb 27, 2021
@alalek alalek mentioned this pull request Mar 2, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alalek alalek

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@alalek @komakai @sturkmen72 @mshabunin @LaurentBerger @prittt