Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3.4 #13920

Merged
merged 45 commits into from
Feb 26, 2019
Merged

Merge 3.4 #13920

merged 45 commits into from
Feb 26, 2019

Conversation

alalek
Copy link
Member

@alalek alalek commented Feb 26, 2019

#13781 from terfendail:warp_wintr
#13837 from amithjkamath:test
#13840 from jaewoosong:jaewoosong-patch-1
#13844 from brad-kelly:integral_avx512_cn234
#13866 from alalek:core_dispatch_mean
#13874 from dkurt:dnn_default_conf_thresh
#13877 from LaurentBerger:pythonvideo
#13882 from dkurt:fix_13479
#13884 from dkurt:dnn_drop_ie_r1_r2
#13887 from dkurt:dnn_ie_lrn_bug
#13889 from mshabunin:enable-narrowing-warning
#13892 from dkurt:onnx_upsample_unsqueeze
#13893 from alalek:core_dispatch_split
#13900 from alalek:core_dispatch_merge
#13901 from reunanen:update_libjpeg-turbo
#13903 from nglee:dev_CudevRework (moved to opencv_contrib)
#13906 from dkurt:fix_tf_ssd_min_size
#13912 from alalek:cmake_workaround_trycompile_ios

Previous "Merge 3.4": #13868

ci_branch=merge-3.4
buildworker:Mac=macosx-1
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

alalek and others added 30 commits February 19, 2019 16:45
Resize reworked using wide universal intrinsics (opencv#13781)

* Added wide universal intrinsics optimized implementation for 3 channel bit-exact linear resize

* Reworked linear resize using new wide LUT intrinsics

* Fix for VSX intrinsics
New computeECC function, and updated findTransformECC function to make gaussian filtering optional (opencv#13837)

* fix for opencv#12432 with doc and tests

* Added doc string for new parameter.

* Fixes suggested by Alalek for getting around ABI incompatibility.

* Update to docstring, to remove parameter that isn't relevant.

* More updates based on Alalek's usggestions.
- Use shfl_down, instead of __shfl_down, on warp scan
- Remove race conditions
@alalek
Copy link
Member Author

alalek commented Feb 26, 2019

👍

@alalek alalek merged commit c3cf35a into opencv:master Feb 26, 2019
@alalek alalek mentioned this pull request Mar 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet