Skip to content

Merge 3.4#19153

Merged
alalek merged 20 commits intoopencv:masterfrom
alalek:merge-3.4
Dec 17, 2020
Merged

Merge 3.4#19153
alalek merged 20 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Dec 17, 2020 •
edited
Loading

#19089 from IanMaquignaz:fix_34_calib3d_parameterReferences
#19101 from alalek:issue_5209
#19106 from xerus:fix_typo
#19110 from alalek:test_videoio_require_ffmpeg
#19114 from alalek:issue_18937
#19115 from alalek:dnn_ocl_conv_fp16_consistency
#19139 from vrabaud:find1
#19143 from vrabaud:stack
#19146 from alalek:dnn_openvino_2021.2.0

Previous "Merge 3.4": #19087

Details 
Xci_branch=merge-3.4
buildworker:Win64 OpenCL=windows-2
#buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
Xbuild_image:Custom=javascript
Xbuildworker: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
build_image:Custom=ubuntu-openvino-2021.2.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
Xbuild_image:Custom Mac=openvino-2021.1.0
build_image:Custom Mac=openvino-2021.2.0
#build_image:Custom Win=openvino-2019r3.0
#build_image:Custom Win=openvino-2020.3.0
Xbuild_image:Custom Win=openvino-2020.4.0
Xbuild_image:Custom Win=openvino-2021.1.0
build_image:Custom Win=openvino-2021.2.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 20 commits December 13, 2020 20:57
@alalek
core(opencl): add version check before clCreateFromGLTexture() call
392991f
@xerus
Fix a typo s/VERISON/VERSION/
b01ae2d
@alalek
Merge pull request opencv#19106 from xerus:fix_typo
a8adb99
@alalek
videoio(test): add FFmpeg backend check
48d9031 
- configure through OPENCV_TEST_VIDEOIO_BACKEND_REQUIRE_FFMPEG environment variable
@alalek
dnn(ocl): fix gemm kernels with beta=0
4b3d2c8 
- dst is not initialized, may include NaN values
- 0*NaN produces NaN
@alalek
Merge pull request opencv#19110 from alalek:test_videoio_require_ffmpeg
a9edcc1
@alalek
dnn(ocl): avoid mess FP16/FP32 in convolution layer
c240355
@alalek
Merge pull request opencv#19115 from alalek:dnn_ocl_conv_fp16_consist…
50fed1d 
…ency
Applied '@ref' linking for 3.4 Calib3D parameters and added enum cv::…
085a131 
…fisheye::CALIB_ZERO_DISPARITY == cv::CALIB_ZERO_DISPARITY == 0x400 == 1 << 10.

Fisheye test has been updated to use new enum cv::fisheye::CALIB_ZERO_DISPARITY and included CV_StaticAssert(...) to ensure cv::CALIB_ZERO_DISPARITY == cv::fisheye::CALIB_ZERO_DISPARITY.
@alalek
Merge pull request opencv#19089 from IanMaquignaz:fix_34_calib3d_para…
4107dc7 
…meterReferences
@alalek
Merge pull request opencv#19114 from alalek:issue_18937
7631056
@alalek
Merge pull request opencv#19101 from alalek:issue_5209
d159417
@alalek
dnn: use OpenVINO 2021.2 defines
752cc26 
original commit: 4699d2b
@alalek
dnn(test): update tests for OpenVINO 2021.2
28aab13
@vrabaud
Move big objects (>20k) from stack to heap.
ec3ef52
@vrabaud
Optimize calls to std::string::find() and friends for a single char.
8391a23 
The character literal overload is more efficient. More info at:

http://clang.llvm.org/extra/clang-tidy/checks/performance-faster-string-find.html
@alalek
Merge pull request opencv#19139 from vrabaud:find1
99d750d
@alalek
Merge pull request opencv#19143 from vrabaud:stack
e271623
@alalek
Merge pull request opencv#19146 from alalek:dnn_openvino_2021.2.0
9b4adc9
@alalek
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
624d532
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Dec 17, 2020

👍

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

4 participants

@alalek @JulienMaille @xerus @vrabaud