Skip to content

Merge 3.4#19066

Merged
alalek merged 21 commits intoopencv:masterfrom
alalek:merge-3.4
Dec 9, 2020
Merged

Merge 3.4#19066
alalek merged 21 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Dec 9, 2020 •
edited
Loading

#18996 from LupusSanctus:am/dnn_bilinear_resize
#19015 from alalek:dnn_use_fma
#19019 from alalek:cmake_avoid_excessive_trace_dump
#19022 from alalek:cmake_avoid_duplication_of_winit_self
#19023 from alalek:core_update_allocator_stats_type
#19041 from alalek:issue_19025
#19046 from alalek:issue_16861
#19059 from alalek:fixup_19000
#19060 from alalek:issue_18097
#19061 from alalek:dnn_load_face_detector_with_external_protobuf

Previous "Merge 3.4": #19012

Details 
ci_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
buildworker:Custom=linux-4
Xbuild_image:Custom=javascript-simd:1.39.16
Xbuild_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
#build_image:Custom=ubuntu-openvino-2021.1.0:20.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
Xbuild_image:Custom Mac=openvino-2020.4.0
build_image:Custom Mac=openvino-2021.1.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
Xbuild_image:Custom Win=openvino-2020.4.0
build_image:Custom Win=openvino-2021.1.0
test_bigdata:Custom Win=1
test_filter:Custom Win=*
test_modules=dnn,python2,python3,java
test_opencl:Custom Win=OFF
build_contrib:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

alalek and others added 21 commits December 5, 2020 11:51
@alalek
dnn: prefer to use v_fma() instead of v_c += v_a * v_b
00f36a3
@alalek
cmake: avoid excessive output from cmake --trace/--trace-expand
8ae1552 
- `cmake . --trace-expand -DCMAKE_TRACE_MODE=1`
@alalek
cmake: avoid duplication of -Winit-self flag
6bfb0dd
@alalek
core: update handling of allocator stats type
26e8048 
- don't use OPENCV_ALLOCATOR_STATS_COUNTER_TYPE definition in non C++11 builds
- don't use with MinGW
@alalek
Merge pull request opencv#19022 from alalek:cmake_avoid_duplication_o…
a9f4f8d 
…f_winit_self
@alalek
Merge pull request opencv#19015 from alalek:dnn_use_fma
e5d2642
@alalek
Merge pull request opencv#19019 from alalek:cmake_avoid_excessive_tra…
c6e60f0 
…ce_dump
@alalek
Merge pull request opencv#19023 from alalek:core_update_allocator_sta…
2c634ee 
…ts_type
@alalek
videoio(test): skip GStreamer in 'frame_timestamp' tests
962f5c9 
- CAP_PROP_POS_MSEC is not reliable
@alalek
Merge pull request opencv#19041 from alalek:issue_19025
3377dda
@alalek
android: use protected fields in JavaCamera2View
fb85974
@alalek
Merge pull request opencv#19046 from alalek:issue_16861
e8348e5
@alalek
cmake: fix handling of wrappers dependencies
7fa9efb
Added TF resize_bilinear behaviour alignment
a82c50e 
Fixes OpenCV issue opencv#18721
@alalek
Merge pull request opencv#18996 from LupusSanctus:am/dnn_bilinear_resize
d8107a5
@alalek
js(wasm): use fallback on missing intrinsics in Emscripten 2.0.0+
d2bc0e5
@alalek
dnn(caffe): add DetectionOutputParameter.clip to .proto file
d7e936d 
- allow to load opencv_face_detector with external unpatched protobuf
@alalek
Merge pull request opencv#19059 from alalek:fixup_19000
37bfb3c
@alalek
Merge pull request opencv#19060 from alalek:issue_18097
c42d0c8
@alalek
Merge pull request opencv#19061 from alalek:dnn_load_face_detector_wi…
8286d84 
…th_external_protobuf
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
de38500
This was referenced Dec 9, 2020
Merged
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Dec 9, 2020

👍

@alalek alalek merged commit de38500 into opencv:master Dec 9, 2020
@alalek alalek mentioned this pull request Dec 11, 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.

1 participant

@alalek