Skip to content

Merge 3.4#18497

Merged
alalek merged 14 commits intoopencv:masterfrom
alalek:merge-3.4
Oct 2, 2020
Merged

Merge 3.4#18497
alalek merged 14 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Oct 2, 2020 •
edited
Loading

#18431 from zhuqiang00099:fix-darknet_relu
#18438 from alalek:dnn_onnx_importer_error_reporting
#18444 from aitikgupta:check-minimum-points
#18458 from sturkmen72:Update_window_w32_cpp
#18487 from aitikgupta:unnecessary-variable
#18488 from alalek:maxflow_missing_check

Previous "Merge 3.4": #18453

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
build_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
#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
build_image:Custom Mac=openvino-2020.4.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
build_image:Custom Win=openvino-2020.4.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

alalek and others added 14 commits September 27, 2020 23:04
@alalek
dnn: improve debugging of ONNX parsing errors
e59793c
@aitikgupta
need atleast 4 corresponding points to calculate homography
94e0ac7
@aitikgupta
added minPoints Homography test
cbf978d
@alalek
Merge pull request opencv#18438 from alalek:dnn_onnx_importer_error_r…
969b550 
…eporting
@sturkmen72
Update window_w32.cpp
14e264f
@aitikgupta
removed no-affect variable
7bd8ddc
@alalek
calib3d/imgproc: add GCGraph::maxFlow() missing empty checks
c6b63e0
@zhuqiang00099 @alalek
fix darknet-relu bug in darknet_io.cpp
a968ead
@alalek
Merge pull request opencv#18431 from zhuqiang00099:fix-darknet_relu
2ea7269
@alalek
Merge pull request opencv#18444 from aitikgupta:check-minimum-points
3503a36
@alalek
Merge pull request opencv#18458 from sturkmen72:Update_window_w32_cpp
1ddd61f
@alalek
Merge pull request opencv#18487 from aitikgupta:unnecessary-variable
6add3b9
@alalek
Merge pull request opencv#18488 from alalek:maxflow_missing_check
a5b8f16
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
199687a
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Oct 2, 2020

👍

@alalek alalek merged commit 199687a into opencv:master Oct 2, 2020
@alalek alalek mentioned this pull request Oct 7, 2020
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.

4 participants

@alalek @aitikgupta @sturkmen72 @zhuqiang00099