Skip to content

Merge 3.4#15112

Merged
alalek merged 10 commits intoopencv:masterfrom
alalek:merge-3.4
Jul 21, 2019
Merged

Merge 3.4#15112
alalek merged 10 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jul 21, 2019 •
edited
Loading

#15032 from l-bat:reduce_mean
#15092 from alalek:videoio_gstreamer_more_get_checks
#15093 from tomoaki0705:fixCudaLegacyRansac (moved to opencv_contrib)
#15104 from alalek:videoio_fix_debug_message (not applicable)
#15107 from dkurt:js_features2d_drawings

Previous "Merge 3.4": #15089

buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1,linux-2,linux-4
docker_image:Docs=docs-js
docker_image:Custom=javascript
#docker_image:Custom=powerpc64le
#docker_image:Custom=ubuntu-openvino:16.04
#buildworker:Custom=linux-2
#docker_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
#docker_image:Custom=fedora:28
#docker_image:Custom=ubuntu-cuda:16.04
build_image:Custom Mac=openvino-2019r1
build_image:Custom Win=openvino-2019r1
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

alalek and others added 10 commits July 18, 2019 21:45
@alalek
videoio: fix debug message
228af2d
@tomoaki0705
cudalegacy: fix test failure of SolvePnPRansac
c6de84d 
  * use SOLVE_EPNP for the initial guess
@alalek
videoio(gstreamer): more .get() checks
61f589d
@alalek
Merge pull request opencv#15092 from alalek:videoio_gstreamer_more_ge…
a8a71eb 
…t_checks
@l-bat @alalek
Merge pull request opencv#15032 from l-bat:reduce_mean
781f4d4 
* Added support for the ONNX "ReduceMean" Layer. (as this is the same as the GlobalAveragePool)

* Add ReduceMean test

* Fix ONNX importer

* Fix ReduceMean

* Add assert

* Split test

* Fix split test
@alalek
Merge pull request opencv#15093 from tomoaki0705:fixCudaLegacyRansac
099f4f9
@dkurt
Fix drawKeypoints and drawMatches for JS
a66a1a2
@alalek
Merge pull request opencv#15104 from alalek:videoio_fix_debug_message
557990f
@alalek
Merge pull request opencv#15107 from dkurt:js_features2d_drawings
ad092bf
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
426482e
This was referenced Jul 21, 2019
Merged
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jul 21, 2019

👍

@alalek alalek merged commit 426482e into opencv:master Jul 21, 2019
@alalek alalek mentioned this pull request Jul 25, 2019
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 @tomoaki0705 @l-bat @dkurt