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 #16734

Merged
merged 18 commits into from Mar 5, 2020
Merged

Merge 3.4 #16734

merged 18 commits into from Mar 5, 2020

Conversation

alalek
Copy link
Member

@alalek alalek commented Mar 4, 2020

#15765 from zachlowry:patch-1
#16573 from ashishkrshrivastava:opencvonnx
#16652 from MoonChasing:master
#16700 from alalek:fix_core_matexpr_size_gemm
#16704 from alalek:core_log_once_log_if
#16709 from ashishkrshrivastava:cvonnx
#16716 from l-bat:skip_resize_ie
#16721 from mshabunin:fix-msmf-format
#16722 from l-bat:reshape_opset_11
#16731 from alalek:issue_16708

Previous "Merge 3.4": #16698

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
#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
#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.1.0
#build_image:Custom Win=openvino-2019r3.0
build_image:Custom Win=openvino-2020.1.0
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

MoonChasing and others added 18 commits February 28, 2020 20:36
core: fix MatExpr::size() for gemm()

* core(test): MatExpr::size() test for gemm()

* core: fix MatExpr::size() for gemm()
…tor_mat_template

The hard-coded string value "Mat" was used in the two format strings for vector_mat and vector_mat_template, preventing UMat arguments to functions that have these types from working correctly. as noted in opencv#12231.
* Supported Div op for constants

* Added Mul test
Use argument value for 'mat' in call to format for vector_mat and vector_mat_template
* imgproc(integral): avoid OOB access

* imgproc(test): fix integral perf check

- FP32 computation is not accurate

* imgproc(integral): tune loop limits
* core(logger): add CV_LOG_ONCE_xxx() CV_LOG_IF_xxx() macros

* core(logger): keep tests disabled
@alalek
Copy link
Member Author

alalek commented Mar 5, 2020

👍

@alalek alalek merged commit d4a17da into opencv:master Mar 5, 2020
@alalek alalek mentioned this pull request Mar 6, 2020
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

6 participants