Skip to content

Merge 3.4#17273

Merged
alalek merged 33 commits intoopencv:masterfrom
alalek:merge-3.4
May 12, 2020
Merged

Merge 3.4#17273
alalek merged 33 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented May 12, 2020 •
edited
Loading

#17118 from l-bat/concat_3d
#17196 from alalek:core_matexpr_fix_warning
#17208 from hn-88:3.4
#17211 from alalek:sift_dispatch
#17218 from hunter-college-ossd-spr-2020:numpy-links-17212
#17219 from hunter-college-ossd-spr-2020:mathjax-link
#17223 from hunter-college-ossd-spr-2020:imgproc-toc
#17228 from mshabunin:mfx-surface-pool-34
#17230 from asmorkalov:as/issue_17171
#17233 from l-bat:onnx_bn
#17235 from R-penguins:patch-1
#17244 from hunter-college-ossd-spr-2020:toc-updates
#17256 from R-penguins:jstutfix
#17260 from jsxyhelu:add_deepgreen_colormap

Previous "Merge 3.4": #17231

buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.1.0:16.04
#build_image:Custom=ubuntu-openvino-2020.2.0:16.04
#buildworker:Custom=linux-2
#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.2.0
build_image:Custom Mac=openvino-2020.2.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.1.0
build_image:Custom Win=openvino-2020.2.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

l-bat and others added 30 commits April 21, 2020 15:15
@l-bat
Supported TF concat 3d
aa08900
@l-bat
Skip myriad
1c1762d
@l-bat
Fix test
4bf94cb
@alalek
features2d: copy sift.simd.hpp
7093752
@alalek
features2d: copy sift.dispatch.cpp
9926a93
@alalek
features2d: keep history of simd.cpp
c05ac87
@alalek
core(MatExpr): fix warning in case of e.s == (0, 0, 0, 0)
74e4cfd
@hn-88
to make OpenCV compile on mingw32
ea04f9d 
added #define NO_DSHOW_STRSAFE
@alalek
features2d(sift): enable runtime dispatching
1f97131
@dmallia17
Update NumPy links
1622e7c
@dmallia17
Update Supported formula commands - MathJax link
64b0757
@dmallia17
Update imgproc tutorials table of content Languages fields
c934d9c
@alalek
Merge pull request opencv#17218 from hunter-college-ossd-spr-2020:num…
1889d72 
…py-links-17212
@alalek
Merge pull request opencv#17219 from hunter-college-ossd-spr-2020:mat…
93d79d2 
…hjax-link
@alalek
Merge pull request opencv#17223 from hunter-college-ossd-spr-2020:img…
73bbabc 
…proc-toc
@asmorkalov
Added Java and C++ regression test for estimateNewCameraMatrixForUndi…
7c17695 
…stortRectify.
@dmallia17
Update tutorials tables of content for several modules
4e78963
@alalek
Merge pull request opencv#17208 from hn-88:3.4
64f5471
@alalek
Merge pull request opencv#17118 from l-bat/concat_3d
066259b 
 Added NDHWC Concat support for TensorFlow

* Supported TF concat 3d

* Skip myriad

* Fix test
@R-penguins
Update Image Watch Tutorial
b43da8a 
Updated the Windows Visual Studio Image Watch tutorial to include download links to the latest versions of Visual Studio Image Watch for newer Visual Studio versions.
@alalek
Merge pull request opencv#17235 from R-penguins:patch-1
fd06139
@R-penguins
Easier access to opencv.js in tutorial
e9058ea
@alalek
Merge pull request opencv#17256 from R-penguins:jstutfix
ac54bb1
@alalek
Merge pull request opencv#17244 from hunter-college-ossd-spr-2020:toc…
23e336e 
…-updates
@alalek
Merge pull request opencv#17230 from asmorkalov:as/issue_17171
1bf353b
@jsxyhelu @alalek
add DeepGreen colormap
48e9e65
@l-bat
Merge pull request opencv#17233 from l-bat:onnx_bn
79f8b7f 
* Added ONNX BatchNorm subgraph

* Move removing constant inputs to addConstantNodesForInitializers

* Added initializers to ONNXGraphWrapper
@mshabunin
CAP_MFX: surface pool with timeout, more parameters
f309318
@alalek
Merge pull request opencv#17196 from alalek:core_matexpr_fix_warning
bd1b252
@alalek
Merge pull request opencv#17211 from alalek:sift_dispatch
8b51e2d
This was referenced May 12, 2020
Merged
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented May 12, 2020

👍

@alalek alalek merged commit 06bff34 into opencv:master May 12, 2020
@alalek alalek mentioned this pull request May 18, 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.

8 participants

@alalek @l-bat @hn-88 @dmallia17 @asmorkalov @R-penguins @jsxyhelu @mshabunin