Skip to content

(4.x) Merge 3.4#21596

Merged
alalek merged 14 commits intoopencv:4.xfrom
alalek:merge-3.4
Feb 11, 2022
Merged

(4.x) Merge 3.4#21596
alalek merged 14 commits intoopencv:4.xfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Feb 10, 2022 •
edited
Loading

#21573 from lamm45:lineiterator-doc
#21577 from sturkmen72:upd_floodfill
#21582 from gfiumara:3.4
#21590 from berak:patch-1
#21591 from alalek:dnn_drop_legacy_ie
#21594 from vrabaud:3.4_msan
#21599 from alalek:winpack_dldt_force_cmake_config

Previous "Merge 3.4": #21572

force_builders=Custom,Custom Win,Custom Mac

buildworker:Docs=linux-4,linux-6
build_image:Docs=docs-js:18.04
Xbuild_image:Custom=javascript
Xbuildworker:Custom=linux-4,linux-6


build_image:Custom Win=winpack-dldt

build_image:Custom=ubuntu-openvino-2021.4.2:20.04
Xbuild_image:Custom=ubuntu-openvino-2022.1.0.dev20220131:20.04
Xbuild_image:Custom Win=openvino-2021.4.2
Xbuild_image:Custom Mac=openvino-2021.4.2

test_modules:Custom=dnn,gapi,python2,python3,java
Xtest_modules:Custom Win=dnn,gapi,python2,python3,java
Xtest_modules:Custom Mac=dnn,gapi,python2,python3,java

buildworker:Custom=linux-1
# disabled due high memory usage: test_opencl:Custom=ON
test_opencl:Custom=ON
test_bigdata:Custom=1
test_filter:Custom=*

Xbuildworker:Custom Win=windows-3
Xtest_bigdata:Custom Win=1
Xtest_filter:Custom Win=*
Xtest_opencl:Custom Win=ON
Xbuild_contrib:Custom Win=OFF

lamm45 and others added 11 commits February 6, 2022 18:42
@lamm45
Update LineIterator documentation
5064b6f
@alalek
Merge pull request opencv#21573 from lamm45:lineiterator-doc
96e23c2
@sturkmen72
fix cv::floodfill() for calling it with an empty mask
ffee1a4
@alalek
Merge pull request opencv#21577 from sturkmen72:upd_floodfill
972a4b9
@berak
Update text_detection.py
8f9c36b 
there is a recent change, how `std::vector<int>` is wrapped in python, 
it used to be a 2d array (requirig that weird `[0]` indexing), now it is only 1d
@gfiumara
Fix cv::FileStorage::Mode::Memory doxygen layout
dae7393
@alalek
Merge pull request opencv#21582 from gfiumara:3.4
9603b68
@alalek
Merge pull request opencv#21590 from berak:patch-1
e8db363
@alalek
dnn: drop legacy Inference Engine NN builder API
effce05
@vrabaud
Merge pull request opencv#21594 from vrabaud:3.4_msan
fc28ba3 
* Fix harmless MSAN error.

This is similar to opencv#21527
A macro is also created to simplify the code.

* Declare fallback only once.
@alalek
Merge pull request opencv#21591 from alalek:dnn_drop_legacy_ie
3215db2
This was referenced Feb 10, 2022
Merged
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Feb 11, 2022

👍

@alalek alalek merged commit 19926e2 into opencv:4.x Feb 11, 2022
@alalek alalek mentioned this pull request Feb 19, 2022
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.

7 participants

@alalek @goodgriefgnome @lamm45 @sturkmen72 @berak @gfiumara @vrabaud