platform/upstream/opencv.git
3 years agoMerge pull request #19334 from alalek:fix_19134
Alexander Alekhin [Fri, 22 Jan 2021 20:05:58 +0000 (20:05 +0000)]
Merge pull request #19334 from alalek:fix_19134

3 years agoMerge pull request #19352 from mshabunin:new-forum-links
Alexander Alekhin [Tue, 19 Jan 2021 21:56:42 +0000 (21:56 +0000)]
Merge pull request #19352 from mshabunin:new-forum-links

3 years agoUpdated more links to forum.opencv.org
Maksim Shabunin [Tue, 19 Jan 2021 18:54:05 +0000 (21:54 +0300)]
Updated more links to forum.opencv.org

3 years agoMerge pull request #19336 from kyshel:patch-1
Alexander Alekhin [Mon, 18 Jan 2021 20:16:04 +0000 (20:16 +0000)]
Merge pull request #19336 from kyshel:patch-1

3 years agoMerge pull request #19312 from VadimLevin:dev/vlevin/clear-msg-for-failed-overload...
Alexander Alekhin [Mon, 18 Jan 2021 20:14:10 +0000 (20:14 +0000)]
Merge pull request #19312 from VadimLevin:dev/vlevin/clear-msg-for-failed-overload-resolution

3 years agofeat: add overload resolution exception for Python bindings
Vadim Levin [Tue, 12 Jan 2021 14:50:07 +0000 (17:50 +0300)]
feat: add overload resolution exception for Python bindings

3 years ago update xrange() to range()
kyshel [Sat, 16 Jan 2021 15:40:02 +0000 (23:40 +0800)]
 update xrange() to range()

update xrange() to range() as Python 2 has been deprecate, more info:
1.  Python 2 has been no longer supported officially since January 1, 2020.  Check  https://www.python.org/doc/sunset-python-2/
2.  xrange() was renamed to range() in Python 3. Check  https://stackoverflow.com/questions/17192158/nameerror-global-name-xrange-is-not-defined-in-python-3/17192181#17192181

update xrange() to range()

Update py_fourier_transform.markdown

update xrange() to range()

3 years agocore(ocl): fix lifetime handling of Image kernel args
Alexander Alekhin [Fri, 15 Jan 2021 17:58:57 +0000 (17:58 +0000)]
core(ocl): fix lifetime handling of Image kernel args

3 years agoMerge pull request #19339 from ichisadashioko:modules_highgui_src_window_w32_typo
Alexander Alekhin [Sun, 17 Jan 2021 22:00:00 +0000 (22:00 +0000)]
Merge pull request #19339 from ichisadashioko:modules_highgui_src_window_w32_typo

3 years agofix typo of the word storage
shioko [Sun, 17 Jan 2021 18:59:20 +0000 (18:59 +0000)]
fix typo of the word storage

3 years agoMerge pull request #19332 from alalek:xcode_ccache
Alexander Alekhin [Sat, 16 Jan 2021 18:58:02 +0000 (18:58 +0000)]
Merge pull request #19332 from alalek:xcode_ccache

3 years agoMerge pull request #19330 from l-bat:lb/onnx_mish_subgraph
Alexander Alekhin [Sat, 16 Jan 2021 18:42:19 +0000 (18:42 +0000)]
Merge pull request #19330 from l-bat:lb/onnx_mish_subgraph

3 years agocmake: support ccache with Xcode generator
Alexander Alekhin [Fri, 15 Jan 2021 19:25:55 +0000 (19:25 +0000)]
cmake: support ccache with Xcode generator

3 years agoAdded Mish ONNX subgraph
Liubov Batanina [Fri, 15 Jan 2021 11:01:48 +0000 (14:01 +0300)]
Added Mish ONNX subgraph

3 years agoMerge pull request #19268 from fpetrogalli:tabs-summary-output
Francesco Petrogalli [Thu, 14 Jan 2021 12:01:36 +0000 (12:01 +0000)]
Merge pull request #19268 from fpetrogalli:tabs-summary-output

* [ts][summary.py] Extend `-o` to support tabs separated output.

* [ts][summary.py] Improve TABS sepatated output.

There is no need to print TAB at the beginning and at the end of each
row in the table.

Cosmetic change: using python list comprehension instead of for loop
to process a single row.

3 years agoMerge pull request #19300 from alkasm:patch-2
Alexander Alekhin [Tue, 12 Jan 2021 18:28:58 +0000 (18:28 +0000)]
Merge pull request #19300 from alkasm:patch-2

3 years agoMerge pull request #19216 from terfendail:wasm_fall
Alexander Alekhin [Tue, 12 Jan 2021 17:57:24 +0000 (17:57 +0000)]
Merge pull request #19216 from terfendail:wasm_fall

3 years agohotfix: call isOpened() in python bg sub tutorial
Alexander Reynolds [Sat, 9 Jan 2021 09:44:54 +0000 (01:44 -0800)]
hotfix: call isOpened() in python bg sub tutorial

https://github.com/opencv/opencv/issues/19299

3 years agoMerge pull request #19301 from krush11:3.4
Alexander Alekhin [Mon, 11 Jan 2021 20:58:33 +0000 (20:58 +0000)]
Merge pull request #19301 from krush11:3.4

3 years agoMerge pull request #19297 from raaldrid:Template_Match_Tutorial_fix_17739
Alexander Alekhin [Mon, 11 Jan 2021 20:54:53 +0000 (20:54 +0000)]
Merge pull request #19297 from raaldrid:Template_Match_Tutorial_fix_17739

3 years agoMerge pull request #19296 from raaldrid:Doc_issue_fix_18836_FULL
Alexander Alekhin [Mon, 11 Jan 2021 20:04:49 +0000 (20:04 +0000)]
Merge pull request #19296 from raaldrid:Doc_issue_fix_18836_FULL

3 years agoMerge pull request #19291 from gpiffault:docs-js_usage-fix_imshow
Alexander Alekhin [Mon, 11 Jan 2021 20:03:29 +0000 (20:03 +0000)]
Merge pull request #19291 from gpiffault:docs-js_usage-fix_imshow

3 years agoMerge pull request #19248 from LaurentBerger:forum
Alexander Alekhin [Mon, 11 Jan 2021 20:02:51 +0000 (20:02 +0000)]
Merge pull request #19248 from LaurentBerger:forum

3 years agoTemplate Matching Tutorial issue fix https://github.com/opencv/opencv/issues/17739
Rachel A [Fri, 8 Jan 2021 20:14:35 +0000 (12:14 -0800)]
Template Matching Tutorial issue fix https://github.com/opencv/opencv/issues/17739

3 years agoMerge pull request #19220 from alalek:dnn_tf_importer_error_reporting
Alexander Alekhin [Mon, 11 Jan 2021 19:12:41 +0000 (19:12 +0000)]
Merge pull request #19220 from alalek:dnn_tf_importer_error_reporting

3 years agoSolution to documentation issue https://github.com/opencv/opencv/issues/18836
Rachel A [Fri, 8 Jan 2021 00:42:13 +0000 (16:42 -0800)]
Solution to documentation issue https://github.com/opencv/opencv/issues/18836

3 years agoupdate forum link
LaurentBerger [Sun, 3 Jan 2021 09:31:58 +0000 (10:31 +0100)]
update forum link

3 years agoInlined WASM fallback intrinsics to avoid using of V_TypeTraits
Vitaly Tuzov [Fri, 25 Dec 2020 12:36:07 +0000 (15:36 +0300)]
Inlined WASM fallback intrinsics to avoid using of V_TypeTraits

3 years agoadded multi-config to regexp
krush11 [Sun, 10 Jan 2021 05:41:23 +0000 (11:11 +0530)]
added multi-config to regexp

3 years agodocs(tutorial_js_usage): fix imshow usage
Grégoire Piffault [Fri, 8 Jan 2021 10:48:57 +0000 (11:48 +0100)]
docs(tutorial_js_usage): fix imshow usage

3 years agoMerge pull request #19258 from notmatthancock:doc/update-sift-patent-blurb
notmatthancock [Tue, 5 Jan 2021 11:33:57 +0000 (05:33 -0600)]
Merge pull request #19258 from notmatthancock:doc/update-sift-patent-blurb

* Remove sentences about SIFT patent and code location

* Add note about patent in opencv-specific section

3 years agocopyright: 2021
Alexander Alekhin [Fri, 1 Jan 2021 13:38:35 +0000 (13:38 +0000)]
copyright: 2021

3 years agoMerge pull request #19239 from justinchuby:justinchuby-doc-typo-hough-lines
Alexander Alekhin [Thu, 31 Dec 2020 10:33:59 +0000 (10:33 +0000)]
Merge pull request #19239 from justinchuby:justinchuby-doc-typo-hough-lines

3 years agoFix typo in hough_lines tutorial
Justin Chu [Wed, 30 Dec 2020 21:20:27 +0000 (16:20 -0500)]
Fix typo in hough_lines tutorial

Argument `minLinLength` -> `minLineLength`

3 years agodnn: improve debugging of TensorFlow parsing errors
Alexander Alekhin [Sat, 26 Dec 2020 09:40:29 +0000 (09:40 +0000)]
dnn: improve debugging of TensorFlow parsing errors

3 years agoMerge pull request #19203 from zchrissirhcz:fix-cvSaveImage
Zhuo Zhang [Thu, 24 Dec 2020 16:58:16 +0000 (00:58 +0800)]
Merge pull request #19203 from zchrissirhcz:fix-cvSaveImage

Fix cvSaveImage( ) function bug

* fix cvSaveImage crash

* replace emplace_back with {}, no C++11 required

* fix MacOSX build with vector's push_back

3 years agoMerge pull request #19210 from alalek:backport_19199
Alexander Alekhin [Thu, 24 Dec 2020 10:01:37 +0000 (10:01 +0000)]
Merge pull request #19210 from alalek:backport_19199

3 years agoMerge pull request #19208 from alalek:js_build_reuse_python
Alexander Alekhin [Thu, 24 Dec 2020 10:01:17 +0000 (10:01 +0000)]
Merge pull request #19208 from alalek:js_build_reuse_python

3 years agoMerge pull request #19207 from alalek:issue_19198
Alexander Alekhin [Thu, 24 Dec 2020 10:00:56 +0000 (10:00 +0000)]
Merge pull request #19207 from alalek:issue_19198

3 years agoFind only shared IE libraries, not plugins
Ilya Lavrenov [Wed, 23 Dec 2020 06:51:23 +0000 (09:51 +0300)]
Find only shared IE libraries, not plugins

original commit: 3ed376d10377eece4c2dba6e0bdee53451da14ed

3 years agojs(build): reuse Python executable used to run main script
Alexander Alekhin [Thu, 24 Dec 2020 05:23:42 +0000 (05:23 +0000)]
js(build): reuse Python executable used to run main script

- don't switch between Python versions in the middle of the build

3 years agojs: fix Python 3 support in make_umd.py
Alexander Alekhin [Wed, 23 Dec 2020 15:07:12 +0000 (15:07 +0000)]
js: fix Python 3 support in make_umd.py

3 years agoMerge pull request #19193 from alalek:samples_python_3.9
Alexander Alekhin [Wed, 23 Dec 2020 12:09:07 +0000 (12:09 +0000)]
Merge pull request #19193 from alalek:samples_python_3.9

3 years agosamples: check for Python 3.9
Alexander Alekhin [Mon, 21 Dec 2020 14:59:34 +0000 (14:59 +0000)]
samples: check for Python 3.9

3 years agoMerge tag '3.4.13'
Alexander Alekhin [Mon, 21 Dec 2020 14:55:54 +0000 (14:55 +0000)]
Merge tag '3.4.13'

3 years agorelease: OpenCV 3.4.13
Alexander Alekhin [Sun, 20 Dec 2020 22:15:49 +0000 (22:15 +0000)]
release: OpenCV 3.4.13

3 years agoMerge pull request #19180 from alalek:fixup_19161
Alexander Alekhin [Sun, 20 Dec 2020 18:39:01 +0000 (18:39 +0000)]
Merge pull request #19180 from alalek:fixup_19161

3 years agojs(build): fix generator with Python3
Alexander Alekhin [Sun, 20 Dec 2020 17:42:47 +0000 (17:42 +0000)]
js(build): fix generator with Python3

- class_info.props is a 'list'

3 years agoMerge pull request #19177 from alalek:doxygen_drop_TCL_SUBST
Alexander Alekhin [Sun, 20 Dec 2020 16:40:58 +0000 (16:40 +0000)]
Merge pull request #19177 from alalek:doxygen_drop_TCL_SUBST

3 years agoMerge pull request #19176 from alalek:issue_19131
Alexander Alekhin [Sun, 20 Dec 2020 16:40:28 +0000 (16:40 +0000)]
Merge pull request #19176 from alalek:issue_19131

3 years agoMerge pull request #19175 from alalek:issue_18520
Alexander Alekhin [Sun, 20 Dec 2020 16:39:56 +0000 (16:39 +0000)]
Merge pull request #19175 from alalek:issue_18520

3 years agoMerge pull request #19164 from fpetrogalli:tranform_16u
Alexander Alekhin [Sun, 20 Dec 2020 16:38:59 +0000 (16:38 +0000)]
Merge pull request #19164 from fpetrogalli:tranform_16u

3 years ago[cv::transform] Enable CV_SIMD for the 16U case on AArch64.
Francesco Petrogalli [Fri, 18 Dec 2020 15:08:02 +0000 (15:08 +0000)]
[cv::transform] Enable CV_SIMD for the 16U case on AArch64.

3 years agoMerge pull request #18604 from vrabaud:master
Alexander Alekhin [Sun, 20 Dec 2020 15:50:32 +0000 (15:50 +0000)]
Merge pull request #18604 from vrabaud:master

3 years agoReplace FLANNException by CV_Error.
Vincent Rabaud [Sat, 17 Oct 2020 02:39:05 +0000 (04:39 +0200)]
Replace FLANNException by CV_Error.

3 years agodoxygen: drop deprecated TCL_SUBST
Alexander Alekhin [Sun, 20 Dec 2020 05:05:48 +0000 (05:05 +0000)]
doxygen: drop deprecated TCL_SUBST

3 years agodocs(core): fix process_video_frame() code snippet
Alexander Alekhin [Sun, 20 Dec 2020 02:27:46 +0000 (02:27 +0000)]
docs(core): fix process_video_frame() code snippet

3 years agoimgproc: add rotatedRectangleIntersection empty input handling
Alexander Alekhin [Sun, 20 Dec 2020 02:05:46 +0000 (02:05 +0000)]
imgproc: add rotatedRectangleIntersection empty input handling

3 years agoMerge pull request #19170 from vrabaud:3.4
Alexander Alekhin [Sat, 19 Dec 2020 19:22:30 +0000 (19:22 +0000)]
Merge pull request #19170 from vrabaud:3.4

3 years agoFix comment typos.
Vincent Rabaud [Sat, 19 Dec 2020 07:22:37 +0000 (08:22 +0100)]
Fix comment typos.

3 years agoMerge pull request #19162 from alalek:backport_18985
Alexander Alekhin [Fri, 18 Dec 2020 20:29:49 +0000 (20:29 +0000)]
Merge pull request #19162 from alalek:backport_18985

3 years agoMerge pull request #19158 from alalek:build_opencv_winpack_dldt_2021.2.0
Alexander Alekhin [Fri, 18 Dec 2020 20:29:33 +0000 (20:29 +0000)]
Merge pull request #19158 from alalek:build_opencv_winpack_dldt_2021.2.0

3 years agoMerge pull request #19152 from LupusSanctus:am/color_issue
Alexander Alekhin [Fri, 18 Dec 2020 20:28:12 +0000 (20:28 +0000)]
Merge pull request #19152 from LupusSanctus:am/color_issue

3 years agoAdded YUV conversion fix
Anastasia Murzova [Thu, 17 Dec 2020 18:25:30 +0000 (21:25 +0300)]
Added YUV conversion fix

Fixed OpenCV issue #18878

3 years agoMerge pull request #19161 from alalek:js_robust_code_generation
Alexander Alekhin [Fri, 18 Dec 2020 15:12:17 +0000 (15:12 +0000)]
Merge pull request #19161 from alalek:js_robust_code_generation

3 years agoMerge pull request #19127 from asmorkalov:as/photo_fix_arm64
Alexander Alekhin [Fri, 18 Dec 2020 13:42:26 +0000 (13:42 +0000)]
Merge pull request #19127 from asmorkalov:as/photo_fix_arm64

3 years agojs: backport PR18985
Steffen Urban [Fri, 18 Dec 2020 12:01:48 +0000 (13:01 +0100)]
js: backport PR18985

original commit: b82700ae4104a527534e66d3eb91f9835bc7957b

3 years agojs: robust code generation
Alexander Alekhin [Fri, 18 Dec 2020 11:48:49 +0000 (11:48 +0000)]
js: robust code generation

- avoid randomized output due to unpredictable dict/set order

3 years agoIncreased Photo_CalibrateDebevec.regression test tolerance to pass on arm64 with...
Alexander Smorkalov [Tue, 15 Dec 2020 13:40:41 +0000 (16:40 +0300)]
Increased Photo_CalibrateDebevec.regression test tolerance to pass on arm64 with gcc 9.3.

3 years agoMerge pull request #19154 from alalek:fixup_19089
Alexander Alekhin [Fri, 18 Dec 2020 11:23:02 +0000 (11:23 +0000)]
Merge pull request #19154 from alalek:fixup_19089

3 years agoMerge pull request #19137 from VadimLevin:dev/vlevin/safe-string-conversion
Alexander Alekhin [Fri, 18 Dec 2020 11:20:50 +0000 (11:20 +0000)]
Merge pull request #19137 from VadimLevin:dev/vlevin/safe-string-conversion

3 years agoMerge pull request #19105 from alalek:js_build_update
Alexander Alekhin [Fri, 18 Dec 2020 11:12:30 +0000 (11:12 +0000)]
Merge pull request #19105 from alalek:js_build_update

3 years agoMerge pull request #19104 from alalek:docs_cmake_msvs2019
Alexander Alekhin [Fri, 18 Dec 2020 11:10:51 +0000 (11:10 +0000)]
Merge pull request #19104 from alalek:docs_cmake_msvs2019

3 years agodoc(windows): update how to handle MSVS 2019
Alexander Alekhin [Mon, 14 Dec 2020 02:52:44 +0000 (02:52 +0000)]
doc(windows): update how to handle MSVS 2019

3 years agobuild: winpack_dldt with dldt 2021.2.0
Alexander Alekhin [Thu, 17 Dec 2020 20:19:26 +0000 (20:19 +0000)]
build: winpack_dldt with dldt 2021.2.0

3 years agodocs(calib3d): avoid reference on legacy C API constants
Alexander Alekhin [Thu, 17 Dec 2020 21:02:55 +0000 (21:02 +0000)]
docs(calib3d): avoid reference on legacy C API constants

3 years agoMerge pull request #19146 from alalek:dnn_openvino_2021.2.0
Alexander Alekhin [Thu, 17 Dec 2020 19:50:36 +0000 (19:50 +0000)]
Merge pull request #19146 from alalek:dnn_openvino_2021.2.0

3 years agoMerge pull request #19143 from vrabaud:stack
Alexander Alekhin [Thu, 17 Dec 2020 19:47:42 +0000 (19:47 +0000)]
Merge pull request #19143 from vrabaud:stack

3 years agoMerge pull request #19139 from vrabaud:find1
Alexander Alekhin [Thu, 17 Dec 2020 19:40:22 +0000 (19:40 +0000)]
Merge pull request #19139 from vrabaud:find1

3 years agoOptimize calls to std::string::find() and friends for a single char.
Vincent Rabaud [Wed, 16 Dec 2020 15:06:58 +0000 (16:06 +0100)]
Optimize calls to std::string::find() and friends for a single char.

The character literal overload is more efficient. More info at:

http://clang.llvm.org/extra/clang-tidy/checks/performance-faster-string-find.html

3 years agoMove big objects (>20k) from stack to heap.
Vincent Rabaud [Wed, 16 Dec 2020 16:27:55 +0000 (17:27 +0100)]
Move big objects (>20k) from stack to heap.

3 years agodnn(test): update tests for OpenVINO 2021.2
Alexander Alekhin [Thu, 17 Dec 2020 07:53:35 +0000 (07:53 +0000)]
dnn(test): update tests for OpenVINO 2021.2

3 years agodnn: use OpenVINO 2021.2 defines
Alexander Alekhin [Wed, 16 Dec 2020 22:22:17 +0000 (22:22 +0000)]
dnn: use OpenVINO 2021.2 defines

original commit: 4699d2ba0c5447516ac89dc732704028838a3f86

3 years agoMerge pull request #19101 from alalek:issue_5209
Alexander Alekhin [Wed, 16 Dec 2020 22:13:18 +0000 (22:13 +0000)]
Merge pull request #19101 from alalek:issue_5209

3 years agofix: conversion to string in python bindings
Vadim Levin [Wed, 16 Dec 2020 10:30:11 +0000 (13:30 +0300)]
fix: conversion to string in python bindings

 If provided `PyObject` can't be converted to string `TypeError` is
 reported instead of `SytemError` without any message.

3 years agoMerge pull request #19114 from alalek:issue_18937
Alexander Alekhin [Tue, 15 Dec 2020 20:47:05 +0000 (20:47 +0000)]
Merge pull request #19114 from alalek:issue_18937

3 years agoMerge pull request #19089 from IanMaquignaz:fix_34_calib3d_parameterReferences
Alexander Alekhin [Tue, 15 Dec 2020 20:46:09 +0000 (20:46 +0000)]
Merge pull request #19089 from IanMaquignaz:fix_34_calib3d_parameterReferences

3 years agoApplied '@ref' linking for 3.4 Calib3D parameters and added enum cv::fisheye::CALIB_Z...
Ian Maquignaz [Sat, 12 Dec 2020 01:16:40 +0000 (20:16 -0500)]
Applied '@ref' linking for 3.4 Calib3D parameters and added enum cv::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.

3 years agoMerge pull request #19115 from alalek:dnn_ocl_conv_fp16_consistency
Alexander Alekhin [Tue, 15 Dec 2020 16:09:15 +0000 (16:09 +0000)]
Merge pull request #19115 from alalek:dnn_ocl_conv_fp16_consistency

3 years agodnn(ocl): avoid mess FP16/FP32 in convolution layer
Alexander Alekhin [Tue, 15 Dec 2020 01:34:20 +0000 (01:34 +0000)]
dnn(ocl): avoid mess FP16/FP32 in convolution layer

3 years agoMerge pull request #19110 from alalek:test_videoio_require_ffmpeg
Alexander Alekhin [Tue, 15 Dec 2020 08:48:23 +0000 (08:48 +0000)]
Merge pull request #19110 from alalek:test_videoio_require_ffmpeg

3 years agodnn(ocl): fix gemm kernels with beta=0
Alexander Alekhin [Tue, 15 Dec 2020 00:41:35 +0000 (00:41 +0000)]
dnn(ocl): fix gemm kernels with beta=0

- dst is not initialized, may include NaN values
- 0*NaN produces NaN

3 years agovideoio(test): add FFmpeg backend check
Alexander Alekhin [Mon, 14 Dec 2020 18:29:52 +0000 (18:29 +0000)]
videoio(test): add FFmpeg backend check

- configure through OPENCV_TEST_VIDEOIO_BACKEND_REQUIRE_FFMPEG environment variable

3 years agoMerge pull request #19106 from xerus:fix_typo
Alexander Alekhin [Mon, 14 Dec 2020 16:27:52 +0000 (16:27 +0000)]
Merge pull request #19106 from xerus:fix_typo

3 years agoFix a typo s/VERISON/VERSION/
Pavel Grunt [Mon, 14 Dec 2020 11:02:25 +0000 (12:02 +0100)]
Fix a typo s/VERISON/VERSION/

3 years agojs: update documentation and builds scripts
Alexander Alekhin [Mon, 14 Dec 2020 04:42:15 +0000 (04:42 +0000)]
js: update documentation and builds scripts

- support modern Emscripten build process
- replaced Docker image
- replaced Emscripten's web URLs

3 years agocore(opencl): add version check before clCreateFromGLTexture() call
Alexander Alekhin [Sun, 13 Dec 2020 19:03:11 +0000 (19:03 +0000)]
core(opencl): add version check before clCreateFromGLTexture() call

3 years agoMerge pull request #19079 from alalek:issue_18713
Alexander Alekhin [Fri, 11 Dec 2020 19:15:26 +0000 (19:15 +0000)]
Merge pull request #19079 from alalek:issue_18713

3 years agoMerge pull request #19084 from alalek:issue_16197
Alexander Alekhin [Fri, 11 Dec 2020 19:13:40 +0000 (19:13 +0000)]
Merge pull request #19084 from alalek:issue_16197

3 years agoMerge pull request #19068 from alalek:issue_18157
Alexander Alekhin [Fri, 11 Dec 2020 19:11:04 +0000 (19:11 +0000)]
Merge pull request #19068 from alalek:issue_18157