Alexander Alekhin
e9e9e3898a
Merge remote-tracking branch 'upstream/3.4'
2021-04-02 11:22:33 +00:00
Alexander Alekhin
9ef20ad20e
Merge pull request #19833 from alalek:workaround_19678
2021-04-02 10:37:29 +00:00
Alexander Alekhin
2cf1a13755
Merge tag '3.4.14'
2021-04-02 09:31:32 +00:00
Anastasia M
1263949e70
Merge pull request #18237 from LupusSanctus:am/pytorch_tf_det_tutorial
...
[GSoC] Added TF and PyTorch detection model conversion cases
* Added object detection convertion pipeline and tutorials
* Added tutorial corrections
2021-04-02 01:50:35 +00:00
Alexander Alekhin
12d80b9e64
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-04-01 21:48:52 +00:00
Alexander Alekhin
d0e3e638c3
release: OpenCV 3.4.14
2021-04-01 21:37:19 +00:00
Anastasia M
ad333e0d22
Merge pull request #17801 from LupusSanctus:am/pytorch_tf_segm
...
[GSoC] Added TF and PyTorch segmentation conversion cases
* WIP: Added conversion of segmentation models
* Added tutorial mds
* remove unused
2021-04-01 20:42:08 +00:00
Orest Chura
34a8a45a6a
Merge pull request #19828 from OrestChura:oc/fix_garray_garray_input
...
[G-API] Fix bug of GArray<GArray> passing through a graph
* Add test to check GArray<GArray> passing through a graph (assertion failed)
* G-API: Flatten GArray<T> to std::vector<T> when capturing VCtr
- Also: Fix formatting in garray.hpp
* Refactored test, added valuable check
* Initialize size_t
Co-authored-by: Dmitry Matveev <dmitry.matveev@intel.com>
2021-04-01 20:39:31 +00:00
Alexander Alekhin
6a72bf5085
Merge pull request #19823 from alalek:issue_contrib_2895
2021-04-01 20:38:46 +00:00
Alexander Alekhin
1e51f87298
Merge pull request #19817 from alalek:cmake_fix_tracking_headers
2021-04-01 20:38:14 +00:00
Alexander Alekhin
8095f601d1
gapi(test): avoid compilation failure with GCC11
2021-04-01 20:23:29 +00:00
Alexander Alekhin
0ff57e3292
Merge pull request #19830 from alalek:issue_19368
2021-04-01 15:30:18 +00:00
Alexander Alekhin
5db484b6c2
Merge pull request #19831 from alalek:backport_19771
2021-04-01 14:05:09 +00:00
Alexander Alekhin
b40d24ad75
Merge pull request #19829 from alalek:hotfix_19693
2021-04-01 14:04:36 +00:00
Alexander Alekhin
6865787a75
Merge pull request #19827 from alalek:build_videoio_macosx_override_3.4
2021-04-01 12:34:23 +00:00
Alexander Alekhin
7f664850f5
Merge pull request #19825 from alalek:cmake_fix_headers_order_python_3.4
2021-04-01 12:34:10 +00:00
Alexander Alekhin
2907fb88f5
Merge pull request #19822 from alalek:core_wui_backward_compatibility
2021-04-01 12:32:33 +00:00
Alexander Alekhin
f839fa4070
Merge pull request #19820 from alalek:issue_19405
2021-04-01 12:32:09 +00:00
Kun Liang
32d51313d0
Merge pull request #19771 from lionkunonly:opencvjsNodeFix
...
* fix the perf tests of OpenCV.js so that it can run on Node.js successfully
* do not modify the CMakeLists.txt
Co-authored-by: lionkun <871518554@qq.com>
2021-04-01 12:29:48 +00:00
Alexander Alekhin
69341edfe6
Merge pull request #19816 from alalek:python_customize_namespaces
2021-04-01 12:27:04 +00:00
Alexander Alekhin
81f0b0e0dc
cmake: fix tracking detail headers
2021-04-01 12:21:18 +00:00
Alexander Alekhin
d7cb2ea210
videoio(dshow): add NULL ptr check
2021-04-01 11:28:41 +00:00
Alexander Alekhin
28f919d9d2
apps(model_diagnostics): fix invalid callback
2021-04-01 10:26:22 +00:00
Alexander Alekhin
4ae2c11520
videoio(build): eliminate inconsistent 'override' warnings
2021-04-01 09:56:21 +00:00
Alexander Alekhin
3e1673e8b2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-04-01 09:54:57 +00:00
Alexander Alekhin
1b3e0b27af
cmake: fix files order in Python bindings
...
- with changes backport from 4.x
2021-04-01 09:48:50 +00:00
Alexander Alekhin
e4b0251e9d
cuda: fix inplace condition in cv::cuda::flip
2021-04-01 02:26:59 +00:00
Alexander Alekhin
b26f5b9468
core: backward compatibility for vx_store/vx_store_aligned calls
2021-04-01 02:17:47 +00:00
Alexander Alekhin
5340dc6686
Merge pull request #19819 from alalek:cmake_fix_headers_order
2021-04-01 01:34:21 +00:00
Alexander Alekhin
174753921d
Merge pull request #19818 from alalek:workaround_python_build_failures
2021-04-01 01:12:07 +00:00
Alexander Alekhin
aa32e3deb1
cmake: fix ADE dependency handling
2021-03-31 23:40:19 +00:00
Alexander Alekhin
2b86de217a
cmake: fix order of headers
...
- cmake uses filesystem's order which may vary
- unpredictable headers order may cause build failures (primary bindings)
2021-03-31 23:16:46 +00:00
Alexander Alekhin
1615afd7f4
Merge pull request #19814 from alalek:pyopencv_to_safe
2021-03-31 22:58:18 +00:00
Alexander Alekhin
908957317f
Merge pull request #19813 from alalek:issue_19506
2021-03-31 22:57:50 +00:00
Alexander Alekhin
6fa2bdd7f2
Merge pull request #19812 from alalek:workaround_19634
2021-03-31 22:57:15 +00:00
Alexander Alekhin
f82303d614
Merge pull request #19811 from alalek:issue_19599
2021-03-31 22:56:48 +00:00
Alexander Alekhin
6773fa03e2
Merge pull request #19808 from alalek:3.4_python_fix_wrap_as
2021-03-31 22:56:14 +00:00
Alexander Alekhin
47fe017a6c
build: workaround sporadic failures of python binding compilation
2021-03-31 22:44:27 +00:00
Alexander Alekhin
7baae20c20
Merge pull request #19815 from OrestChura:oc/fix_garray_garray_input
2021-03-31 22:33:14 +00:00
OrestChura
921c4551d9
Fix conversion of the kernel's input for GArray<GArray<U>> -> vector<vector<U>>
2021-03-31 23:37:44 +03:00
Alexander Alekhin
c20a424e3a
gapi(python): rename cv.gapi_wip_op / cv.gapi_wip_kernels
2021-03-31 20:34:04 +00:00
Alexander Alekhin
2e005f5dc2
python: allow to customize Python namespaces
...
- extra methods through PYOPENCV_EXTRA_METHODS_<NS_UPPER> macros
- extra constants through PYOPENCV_EXTRA_CONSTANTS_<NS_UPPER> macros
2021-03-31 20:33:38 +00:00
Alexander Alekhin
9f13fdb840
Merge pull request #19732 from aDanPin:danpin/gapi/stereo_operation_and_test
...
G-API Stereo operation and tests
2021-03-31 23:22:29 +03:00
aDanPin
e6f52b0996
Adding stereo operation and tests
2021-03-31 20:09:10 +03:00
Alexander Alekhin
d651ff8d6b
python: exception-free pyopencv_to() wrapper
2021-03-31 14:18:32 +00:00
Alexander Alekhin
e11408f6ad
Merge pull request #18903 from mpashchenkov:mp/onnx-disable-output
...
G-API: ONNX. Disable unnecessary outputs
2021-03-31 16:46:22 +03:00
Alexander Alekhin
8069a6b4f8
core(IPP): disable some ippsMagnitude_32f calls
2021-03-31 13:38:57 +00:00
Alexander Alekhin
b697b3162f
videoio(mjpeg): disable parallel encoder
2021-03-31 12:35:12 +00:00
Alexander Alekhin
53a16b1186
Merge pull request #19809 from alalek:issue_19513
2021-03-31 10:50:20 +00:00
Alexander Alekhin
a2a92999be
core(arithm_op): workaround problem with scalars handling
2021-03-31 10:35:52 +00:00
