platform/upstream/opencv.git
3 years agoMerge pull request #18798 from alalek:java_robust_binding_code
Alexander Alekhin [Fri, 13 Nov 2020 21:26:23 +0000 (21:26 +0000)]
Merge pull request #18798 from alalek:java_robust_binding_code

3 years agojava: robust code generation
Alexander Alekhin [Thu, 12 Nov 2020 19:47:54 +0000 (19:47 +0000)]
java: robust code generation

- the same generated code from Python2/3
- avoid randomized output due to unpredictable dict/set order

3 years agoMerge pull request #18774 from alalek:bindings_namespace_inline
Alexander Alekhin [Thu, 12 Nov 2020 12:23:37 +0000 (12:23 +0000)]
Merge pull request #18774 from alalek:bindings_namespace_inline

3 years agobindings: "inline namespace"
Alexander Alekhin [Sat, 7 Nov 2020 18:25:48 +0000 (18:25 +0000)]
bindings: "inline namespace"

3 years agoMerge pull request #18765 from GArik:tutorials
Alexander Alekhin [Tue, 10 Nov 2020 20:08:29 +0000 (20:08 +0000)]
Merge pull request #18765 from GArik:tutorials

3 years agoMerge pull request #18764 from alalek:doxygen_image_path
Alexander Alekhin [Tue, 10 Nov 2020 18:55:10 +0000 (18:55 +0000)]
Merge pull request #18764 from alalek:doxygen_image_path

3 years agoFix code snippets inclusion into video tutorials
Igor Murzov [Tue, 10 Nov 2020 12:36:13 +0000 (15:36 +0300)]
Fix code snippets inclusion into video tutorials

Code snippets need a section marked with ### above to render properly

3 years agodoxygen: adjust IMAGE_PATH, allow custom OPENCV_DOCS_EXTRA_IMAGE_PATH
Alexander Alekhin [Mon, 9 Nov 2020 19:12:09 +0000 (19:12 +0000)]
doxygen: adjust IMAGE_PATH, allow custom OPENCV_DOCS_EXTRA_IMAGE_PATH

- add opencv/modules
- add opencv_contrib/modules

3 years agoMerge pull request #18752 from alalek:dnn_defines_openvino_2021.1.0
Alexander Alekhin [Sun, 8 Nov 2020 18:09:52 +0000 (18:09 +0000)]
Merge pull request #18752 from alalek:dnn_defines_openvino_2021.1.0

3 years agoMerge pull request #18753 from catree:fix_FindOpenBLAS_typo
Alexander Alekhin [Sun, 8 Nov 2020 18:09:26 +0000 (18:09 +0000)]
Merge pull request #18753 from catree:fix_FindOpenBLAS_typo

3 years agoFix typo in OpenCVFindOpenBLAS.cmake file.
catree [Sun, 8 Nov 2020 13:42:47 +0000 (14:42 +0100)]
Fix typo in OpenCVFindOpenBLAS.cmake file.

3 years agodnn: use OpenVINO 2021.1 defines
Alexander Alekhin [Sat, 7 Nov 2020 17:27:33 +0000 (17:27 +0000)]
dnn: use OpenVINO 2021.1 defines

3 years agoMerge pull request #18746 from alalek:backport_18741
Alexander Alekhin [Sat, 7 Nov 2020 15:47:15 +0000 (15:47 +0000)]
Merge pull request #18746 from alalek:backport_18741

4 years agoUse explicit opset of Unsqueeze from nGraph
Roman Kazantsev [Fri, 6 Nov 2020 06:51:40 +0000 (09:51 +0300)]
Use explicit opset of Unsqueeze from nGraph

backporting commit eb24575e2ce6ae56613fe4b9709ea55b4d8a228e

4 years agoMerge pull request #18732 from junxnone:master
Alexander Alekhin [Fri, 6 Nov 2020 16:36:58 +0000 (16:36 +0000)]
Merge pull request #18732 from junxnone:master

4 years agofix truncate threshold example display issue in py_tutorials
junxnone [Thu, 5 Nov 2020 04:25:38 +0000 (12:25 +0800)]
fix truncate threshold example display issue in py_tutorials

Signed-off-by: junxnone <junchen0102@gmail.com>
4 years agoMerge pull request #18699 from alalek:support_ceres_2.0.0
Alexander Alekhin [Thu, 5 Nov 2020 18:55:57 +0000 (18:55 +0000)]
Merge pull request #18699 from alalek:support_ceres_2.0.0

4 years agocmake: prefer using Eigen configuration files
Alexander Alekhin [Thu, 29 Oct 2020 23:38:30 +0000 (23:38 +0000)]
cmake: prefer using Eigen configuration files

- for better compatibility with Ceres 2.0.0 CMake scripts

4 years agoMerge pull request #18736 from mshabunin:mfx-frame-size-34
Alexander Alekhin [Thu, 5 Nov 2020 17:00:35 +0000 (17:00 +0000)]
Merge pull request #18736 from mshabunin:mfx-frame-size-34

4 years agovideoio: added frameSize to MFX capture
Maksim Shabunin [Thu, 5 Nov 2020 10:11:31 +0000 (13:11 +0300)]
videoio: added frameSize to MFX capture

4 years agoMerge pull request #18724 from S-o-T:fix_confusing_naming_for_keypoints_comparator
Alexander Alekhin [Tue, 3 Nov 2020 20:20:11 +0000 (20:20 +0000)]
Merge pull request #18724 from S-o-T:fix_confusing_naming_for_keypoints_comparator

4 years agoChange naming of keypoints comparator
Mark Shachkov [Tue, 3 Nov 2020 18:54:56 +0000 (21:54 +0300)]
Change naming of keypoints comparator

4 years agoMerge pull request #18158 from legrosbuffle:3.4-vectorize-dft-radix
Alexander Alekhin [Fri, 30 Oct 2020 22:05:49 +0000 (22:05 +0000)]
Merge pull request #18158 from legrosbuffle:3.4-vectorize-dft-radix

4 years agoMerge pull request #18672 from alalek:cmake_3rdparty_exclude_from_all
Alexander Alekhin [Wed, 28 Oct 2020 14:40:47 +0000 (14:40 +0000)]
Merge pull request #18672 from alalek:cmake_3rdparty_exclude_from_all

4 years agoMerge pull request #18685 from APrigarina:fix_curved_qrcodes
Alexander Alekhin [Wed, 28 Oct 2020 14:02:08 +0000 (14:02 +0000)]
Merge pull request #18685 from APrigarina:fix_curved_qrcodes

4 years agocmake(3rdparty): use EXCLUDE_FROM_ALL
Alexander Alekhin [Tue, 27 Oct 2020 19:00:25 +0000 (19:00 +0000)]
cmake(3rdparty): use EXCLUDE_FROM_ALL

4 years agofix curved qrcodes decoding
APrigarina [Wed, 28 Oct 2020 09:48:42 +0000 (12:48 +0300)]
fix curved qrcodes decoding

4 years agoMerge pull request #18664 from ackbar345:mikkel/fix-manual-page-size
Alexander Alekhin [Tue, 27 Oct 2020 17:49:21 +0000 (17:49 +0000)]
Merge pull request #18664 from ackbar345:mikkel/fix-manual-page-size

4 years agoBugfix: Manual page sizes now overwrite the default page size if they are both specif...
Mikkel Green [Mon, 26 Oct 2020 23:04:55 +0000 (16:04 -0700)]
Bugfix: Manual page sizes now overwrite the default page size if they are both specified. Remove redudant .upper() call, 1 to 1 key matching enforced
by argparse choices.

4 years agoMerge pull request #18640 from alalek:core_cleanup_inline_code
Alexander Alekhin [Sat, 24 Oct 2020 17:06:08 +0000 (17:06 +0000)]
Merge pull request #18640 from alalek:core_cleanup_inline_code

4 years agoMerge pull request #18003 from APrigarina:curved_qrcodes_decoding
ann [Fri, 23 Oct 2020 18:42:45 +0000 (21:42 +0300)]
Merge pull request #18003 from APrigarina:curved_qrcodes_decoding

Detection and decoding of curved QR-codes

* temp changes for curved qrcodes

* added api for curved qr code decoding

* fixed prototypes

* refactored curved qr code decoding

* refactored curved qr code decoding 2nd part

* refactored curved qr code decoding 3rd part

* refactored curved qr code decoding 4th part

* added tests for curved qr code decoding

* refactored curved qr code decoding 5th part

4 years agoMerge pull request #18633 from laelath:master
Alexander Alekhin [Fri, 23 Oct 2020 16:47:37 +0000 (16:47 +0000)]
Merge pull request #18633 from laelath:master

4 years agoFix TypeError when building for WebAssembly with Python 3
Justin Frank [Wed, 21 Oct 2020 00:31:34 +0000 (17:31 -0700)]
Fix TypeError when building for WebAssembly with Python 3

4 years agoMerge pull request #18641 from rtimpe:fix_cuda_stubs
Alexander Alekhin [Thu, 22 Oct 2020 12:25:55 +0000 (12:25 +0000)]
Merge pull request #18641 from rtimpe:fix_cuda_stubs

4 years agocore: move inline code from mat.inl.hpp
Alexander Alekhin [Wed, 21 Oct 2020 22:47:56 +0000 (22:47 +0000)]
core: move inline code from mat.inl.hpp

4 years agoFix errors when building with cuda stubs
Rob Timpe [Wed, 21 Oct 2020 22:51:46 +0000 (15:51 -0700)]
Fix errors when building with cuda stubs

Fixes two errors when building with the options WITH_CUDA=ON and BUILD_CUDA_STUBS=ON on a machine without CUDA.

In the cudaarithm module, make sure cuda_runtime.h only gets included when CUDA is installed.

In the stitching module, don't assume that cuda is present just because cudaarithm and cudawarping are present (as is the case when building with the above options).

4 years agoMerge pull request #18628 from innerlee:patch-1
Alexander Alekhin [Tue, 20 Oct 2020 20:03:49 +0000 (20:03 +0000)]
Merge pull request #18628 from innerlee:patch-1

4 years agoTypo in docstring of distanceTransform
lizz [Tue, 20 Oct 2020 04:09:03 +0000 (12:09 +0800)]
Typo in docstring of distanceTransform

4 years agoMerge pull request #18614 from ZhiyuanChen:patch-1
Alexander Alekhin [Mon, 19 Oct 2020 22:42:48 +0000 (22:42 +0000)]
Merge pull request #18614 from ZhiyuanChen:patch-1

4 years agofixes #18613
Zhiyuan Chen [Sun, 18 Oct 2020 14:33:45 +0000 (22:33 +0800)]
fixes #18613

4 years agoMerge pull request #18068 from lionkunonly:gsoc_2020_simd
Kun Liang [Sun, 18 Oct 2020 20:30:36 +0000 (04:30 +0800)]
Merge pull request #18068 from lionkunonly:gsoc_2020_simd

[GSoC] OpenCV.js: WASM SIMD optimization 2.0

* gsoc_2020_simd Add perf test for filter2d

* add perf test for kernel scharr and kernel gaussianBlur

* add perf test for blur, medianBlur, erode, dilate

* fix the errors for the opencv PR robot

fix the trailing whitespace.

* add perf tests for kernel remap, warpAffine, warpPersepective, pyrDown

* fix a bug in  modules/js/perf/perf_imgproc/perf_remap.js

* add function smoothBorder in helpfun.js and remove replicated function in perf test of warpAffine and warpPrespective

* fix the trailing white space issues

* add OpenCV.js loader

* Implement the Loader with help of WebAssembly Feature Detection, remove trailing whitespaces

* modify the explantion for loader in js_setup.markdown and fix bug in loader.js

4 years agoMerge pull request #18602 from alalek:issue_18597
Alexander Alekhin [Fri, 16 Oct 2020 20:22:58 +0000 (20:22 +0000)]
Merge pull request #18602 from alalek:issue_18597

4 years agoMerge pull request #18590 from krush11:master
Alexander Alekhin [Fri, 16 Oct 2020 19:47:03 +0000 (19:47 +0000)]
Merge pull request #18590 from krush11:master

4 years agoMerge pull request #18533 from paroj:imwritemulti
Alexander Alekhin [Fri, 16 Oct 2020 19:46:24 +0000 (19:46 +0000)]
Merge pull request #18533 from paroj:imwritemulti

4 years agocore: fix __clang_major__ typo regression
Alexander Alekhin [Fri, 16 Oct 2020 15:35:51 +0000 (15:35 +0000)]
core: fix __clang_major__ typo regression

4 years agoimwrite: multi-image overload for bindings
Pavel Rojtberg [Wed, 7 Oct 2020 10:19:17 +0000 (12:19 +0200)]
imwrite: multi-image overload for bindings

4 years agoUpdate demosaicing.cpp
Krushnal Patel [Wed, 14 Oct 2020 17:52:46 +0000 (23:22 +0530)]
Update demosaicing.cpp

4 years agoMerge pull request #18589 from alalek:issue_13328
Alexander Alekhin [Thu, 15 Oct 2020 18:43:46 +0000 (18:43 +0000)]
Merge pull request #18589 from alalek:issue_13328

4 years agoMerge pull request #18582 from weltonrodrigo:remap_inter_doc
Alexander Alekhin [Wed, 14 Oct 2020 21:13:54 +0000 (21:13 +0000)]
Merge pull request #18582 from weltonrodrigo:remap_inter_doc

4 years agoDoc: INTER_LINEAR_EXACT unsupported in remap
Welton Rodrigo Torres Nascimento [Tue, 13 Oct 2020 14:51:23 +0000 (11:51 -0300)]
Doc: INTER_LINEAR_EXACT unsupported in remap

Update documentation to reflect INTER_LINEAR_EXACT being
unsupported in remap

4 years agoMerge pull request #18568 from catree:fix_deepgreen_colormap_fig
Alexander Alekhin [Tue, 13 Oct 2020 10:02:39 +0000 (10:02 +0000)]
Merge pull request #18568 from catree:fix_deepgreen_colormap_fig

4 years agoMove colorscale_deepgreen.jpg to the correct folder.
catree [Sun, 11 Oct 2020 15:18:05 +0000 (17:18 +0200)]
Move colorscale_deepgreen.jpg to the correct folder.

4 years agoMerge tag '3.4.12'
Alexander Alekhin [Sat, 10 Oct 2020 20:18:09 +0000 (20:18 +0000)]
Merge tag '3.4.12'

4 years agorelease: OpenCV 3.4.12
Alexander Alekhin [Sat, 10 Oct 2020 20:14:29 +0000 (20:14 +0000)]
release: OpenCV 3.4.12

4 years agoMerge pull request #18557 from alalek:cuda_cmake_fix_auto
Alexander Alekhin [Sat, 10 Oct 2020 20:02:03 +0000 (20:02 +0000)]
Merge pull request #18557 from alalek:cuda_cmake_fix_auto

4 years agocmake: fix typo in CUDA_GENERATION=Auto cache
Alexander Alekhin [Fri, 9 Oct 2020 22:00:02 +0000 (22:00 +0000)]
cmake: fix typo in CUDA_GENERATION=Auto cache

4 years agoMerge pull request #18554 from alalek:issue_17945
Alexander Alekhin [Fri, 9 Oct 2020 19:54:17 +0000 (19:54 +0000)]
Merge pull request #18554 from alalek:issue_17945

4 years agodnn(opencl): bypass unsupported fusion cases 2
Alexander Alekhin [Fri, 9 Oct 2020 16:33:48 +0000 (16:33 +0000)]
dnn(opencl): bypass unsupported fusion cases 2

4 years agoMerge pull request #18551 from alalek:issue_17964
Alexander Alekhin [Fri, 9 Oct 2020 16:08:12 +0000 (16:08 +0000)]
Merge pull request #18551 from alalek:issue_17964

4 years agodnn(opencl): bypass unsupported fusion cases
Alexander Alekhin [Fri, 9 Oct 2020 11:57:49 +0000 (11:57 +0000)]
dnn(opencl): bypass unsupported fusion cases

4 years agoMerge pull request #18545 from alalek:enable_tests_17953
Alexander Alekhin [Thu, 8 Oct 2020 21:39:48 +0000 (21:39 +0000)]
Merge pull request #18545 from alalek:enable_tests_17953

4 years agodnn(test): enable tests from issue 17953
Alexander Alekhin [Thu, 8 Oct 2020 20:27:03 +0000 (20:27 +0000)]
dnn(test): enable tests from issue 17953

4 years agoMerge pull request #18534 from alalek:build_opencv_winpack_dldt_2021.1.0
Alexander Alekhin [Thu, 8 Oct 2020 15:32:03 +0000 (15:32 +0000)]
Merge pull request #18534 from alalek:build_opencv_winpack_dldt_2021.1.0

4 years agoMerge pull request #18527 from alalek:dnn_test_openvino
Alexander Alekhin [Thu, 8 Oct 2020 15:27:50 +0000 (15:27 +0000)]
Merge pull request #18527 from alalek:dnn_test_openvino

4 years agodnn(test): update tests for OpenVINO 2021.1
Alexander Alekhin [Tue, 6 Oct 2020 23:40:27 +0000 (23:40 +0000)]
dnn(test): update tests for OpenVINO 2021.1

4 years agoMerge pull request #18536 from alalek:backport_doxygen_style_18195
Alexander Alekhin [Wed, 7 Oct 2020 21:35:57 +0000 (21:35 +0000)]
Merge pull request #18536 from alalek:backport_doxygen_style_18195

4 years agodoxygen: backport style changes
Alexander Alekhin [Wed, 7 Oct 2020 20:16:40 +0000 (20:16 +0000)]
doxygen: backport style changes

4 years agobuild: winpack_dldt with dldt 2021.1.0
Alexander Alekhin [Mon, 5 Oct 2020 21:12:58 +0000 (00:12 +0300)]
build: winpack_dldt with dldt 2021.1.0

4 years agoMerge pull request #18526 from alalek:fix_uninitialized_warnings
Alexander Alekhin [Tue, 6 Oct 2020 22:49:55 +0000 (22:49 +0000)]
Merge pull request #18526 from alalek:fix_uninitialized_warnings

4 years agoMerge pull request #18519 from alalek:fix_javadoc
Alexander Alekhin [Tue, 6 Oct 2020 22:48:21 +0000 (22:48 +0000)]
Merge pull request #18519 from alalek:fix_javadoc

4 years agoMerge pull request #18518 from alalek:backport_17993
Alexander Alekhin [Tue, 6 Oct 2020 22:47:45 +0000 (22:47 +0000)]
Merge pull request #18518 from alalek:backport_17993

4 years agovideoio(dc1394_v2): ensure variable initialization
Alexander Alekhin [Tue, 6 Oct 2020 20:57:40 +0000 (20:57 +0000)]
videoio(dc1394_v2): ensure variable initialization

4 years agoMerge pull request #18517 from alalek:backport_18031
Alexander Alekhin [Tue, 6 Oct 2020 19:56:49 +0000 (19:56 +0000)]
Merge pull request #18517 from alalek:backport_18031

4 years agoMerge pull request #18515 from alalek:test_18473
Alexander Alekhin [Tue, 6 Oct 2020 19:39:27 +0000 (19:39 +0000)]
Merge pull request #18515 from alalek:test_18473

4 years agoMerge pull request #18506 from alalek:issue_18472
Alexander Alekhin [Tue, 6 Oct 2020 19:37:40 +0000 (19:37 +0000)]
Merge pull request #18506 from alalek:issue_18472

4 years agojava: fix javadoc generation
Alexander Alekhin [Tue, 6 Oct 2020 04:28:25 +0000 (04:28 +0000)]
java: fix javadoc generation

4 years ago[IE][VPU]: Refactor vpu configs
Maksim Doronin [Thu, 30 Jul 2020 14:46:37 +0000 (17:46 +0300)]
[IE][VPU]: Refactor vpu configs

backported commit: 7fe87d9a5b3aeda1ae449b57652462247c89ef4a

4 years agoRemoved get_output_as_single_output_node method
Ilya Churaev [Tue, 4 Aug 2020 05:18:38 +0000 (08:18 +0300)]
Removed get_output_as_single_output_node method

backported commit: 5fd3d36fe8b36fb9e39a192fedc9ffec2883efe1

4 years agocore(test): regression test for 18473
Alexander Alekhin [Sun, 4 Oct 2020 07:11:41 +0000 (07:11 +0000)]
core(test): regression test for 18473

4 years agoMerge pull request #18509 from alalek:issue_18392
Alexander Alekhin [Mon, 5 Oct 2020 17:03:27 +0000 (17:03 +0000)]
Merge pull request #18509 from alalek:issue_18392

4 years agoMerge pull request #18507 from sizeofvoid:openbsd
Alexander Alekhin [Mon, 5 Oct 2020 17:02:38 +0000 (17:02 +0000)]
Merge pull request #18507 from sizeofvoid:openbsd

4 years agoMerge pull request #18473 from BioDataAnalysis:bda_fix_cv_mat_steps
Alexander Alekhin [Mon, 5 Oct 2020 16:59:05 +0000 (16:59 +0000)]
Merge pull request #18473 from BioDataAnalysis:bda_fix_cv_mat_steps

4 years agomatrix.cpp::setSize(): fixed out-of-bounds access on cv::Mat steps
Mario Emmenlauer [Wed, 30 Sep 2020 16:16:02 +0000 (18:16 +0200)]
matrix.cpp::setSize(): fixed out-of-bounds access on cv::Mat steps

4 years agodnn: check for empty Net in .forward()
Alexander Alekhin [Mon, 5 Oct 2020 06:23:47 +0000 (06:23 +0000)]
dnn: check for empty Net in .forward()

4 years agoAdd an OpenBSD check
Rafael Sadowski [Sun, 4 Oct 2020 18:43:07 +0000 (20:43 +0200)]
Add an OpenBSD check

4 years agocore: allow to disable including of unsupported/Eigen/CXX11/Tensor
Alexander Alekhin [Sun, 4 Oct 2020 15:11:55 +0000 (15:11 +0000)]
core: allow to disable including of unsupported/Eigen/CXX11/Tensor

- define OPENCV_DISABLE_EIGEN_TENSOR_SUPPORT

4 years agoMerge pull request #18488 from alalek:maxflow_missing_check
Alexander Alekhin [Fri, 2 Oct 2020 15:04:28 +0000 (15:04 +0000)]
Merge pull request #18488 from alalek:maxflow_missing_check

4 years agoMerge pull request #18487 from aitikgupta:unnecessary-variable
Alexander Alekhin [Fri, 2 Oct 2020 15:03:59 +0000 (15:03 +0000)]
Merge pull request #18487 from aitikgupta:unnecessary-variable

4 years agoMerge pull request #18458 from sturkmen72:Update_window_w32_cpp
Alexander Alekhin [Fri, 2 Oct 2020 15:00:44 +0000 (15:00 +0000)]
Merge pull request #18458 from sturkmen72:Update_window_w32_cpp

4 years agoMerge pull request #18444 from aitikgupta:check-minimum-points
Alexander Alekhin [Fri, 2 Oct 2020 14:59:07 +0000 (14:59 +0000)]
Merge pull request #18444 from aitikgupta:check-minimum-points

4 years agoMerge pull request #18431 from zhuqiang00099:fix-darknet_relu
Alexander Alekhin [Fri, 2 Oct 2020 14:58:48 +0000 (14:58 +0000)]
Merge pull request #18431 from zhuqiang00099:fix-darknet_relu

4 years agofix darknet-relu bug in darknet_io.cpp
zhuqiang00099 [Sat, 26 Sep 2020 04:09:30 +0000 (12:09 +0800)]
fix darknet-relu bug in darknet_io.cpp

4 years agocalib3d/imgproc: add GCGraph::maxFlow() missing empty checks
Alexander Alekhin [Thu, 1 Oct 2020 15:20:32 +0000 (15:20 +0000)]
calib3d/imgproc: add GCGraph::maxFlow() missing empty checks

4 years agoremoved no-affect variable
Aitik Gupta [Fri, 2 Oct 2020 03:57:16 +0000 (09:27 +0530)]
removed no-affect variable

4 years agoUpdate window_w32.cpp
Suleyman TURKMEN [Tue, 29 Sep 2020 18:50:06 +0000 (21:50 +0300)]
Update window_w32.cpp

4 years agoMerge pull request #18438 from alalek:dnn_onnx_importer_error_reporting
Alexander Alekhin [Tue, 29 Sep 2020 13:49:02 +0000 (13:49 +0000)]
Merge pull request #18438 from alalek:dnn_onnx_importer_error_reporting

4 years agoadded minPoints Homography test
Aitik Gupta [Mon, 28 Sep 2020 19:34:15 +0000 (01:04 +0530)]
added minPoints Homography test

4 years agoneed atleast 4 corresponding points to calculate homography
Aitik Gupta [Mon, 28 Sep 2020 19:34:01 +0000 (01:04 +0530)]
need atleast 4 corresponding points to calculate homography

4 years agoMerge pull request #18449 from alalek:ios_dont_disable_world_automatically
Alexander Alekhin [Mon, 28 Sep 2020 18:46:28 +0000 (18:46 +0000)]
Merge pull request #18449 from alalek:ios_dont_disable_world_automatically

4 years agoMerge pull request #18447 from alalek:fix_17953
Alexander Alekhin [Mon, 28 Sep 2020 18:45:31 +0000 (18:45 +0000)]
Merge pull request #18447 from alalek:fix_17953