Skip to content

Merge 3.4#18116

Merged
alalek merged 4 commits intoopencv:masterfrom
alalek:merge-3.4
Aug 17, 2020
Merged

Merge 3.4#18116
alalek merged 4 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Aug 17, 2020 •
edited
Loading

#18001 from Yosshi999:sift-8bit-descr
#18105 from alalek:highgui_gtk_dont_terminate

Previous "Merge 3.4": #18099

Xci_branch=merge-3.4
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.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

This was referenced Aug 17, 2020
Merged
Merged
Yosshi999 and others added 2 commits August 17, 2020 10:28
@Yosshi999
Merge pull request opencv#18001 from Yosshi999:sift-8bit-descr
1834eed 
* 8-bit SIFT descriptors

* use clearer parameter

* update docs

* propagate type info

* overload function for avoiding ABI-break

* bugfix: some values are undefined when CV_SIMD is absent
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
8753203
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Aug 17, 2020

👍

@alalek alalek merged commit 8753203 into opencv:master Aug 17, 2020
@alalek alalek mentioned this pull request Aug 21, 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.

2 participants

@alalek @Yosshi999