Alexander Alekhin [Sun, 31 Jan 2021 17:44:15 +0000 (17:44 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sun, 31 Jan 2021 17:41:24 +0000 (17:41 +0000)]
Merge pull request #19430 from alalek:fixup_19216
Alexander Alekhin [Sun, 31 Jan 2021 14:24:37 +0000 (14:24 +0000)]
Merge pull request #19427 from alalek:issue_19426
Alexander Alekhin [Sun, 31 Jan 2021 00:12:51 +0000 (00:12 +0000)]
js: fix SIMD build
Alexander Alekhin [Sat, 30 Jan 2021 12:37:57 +0000 (12:37 +0000)]
Merge pull request #19424 from alalek:cmake_linters_update
Alexander Alekhin [Sat, 30 Jan 2021 11:39:43 +0000 (11:39 +0000)]
Merge pull request #19057 from sl-sergei:changes_for_cuda_1d
Alexander Alekhin [Sat, 30 Jan 2021 11:32:27 +0000 (11:32 +0000)]
build: fix cv2.cpp compilation
Sergey Slashchinin [Tue, 8 Dec 2020 18:28:04 +0000 (21:28 +0300)]
Align 3.4 branch with master
Alexander Alekhin [Fri, 29 Jan 2021 16:59:13 +0000 (16:59 +0000)]
cmake: fix pylint/flake8 detection, update flake8 exclude
Maxim Pashchenkov [Fri, 29 Jan 2021 14:53:42 +0000 (17:53 +0300)]
Merge pull request #18943 from mpashchenkov:mp/onnx-padding
G-API: ONNX. Support for networks with three dimensional input.
* Padding without tests
* Removed padding
* Some small fixes
* Added wstring_convert
* Alignment fix, m b
* Small fixes
* Moved include from onnx.hpp
Alexander Alekhin [Fri, 29 Jan 2021 12:34:00 +0000 (12:34 +0000)]
Merge pull request #19395 from Ixarias:patch-1
Olivier Le Doeuff [Fri, 29 Jan 2021 10:18:09 +0000 (11:18 +0100)]
Merge pull request #19370 from OlivierLDff:patch-dshow-convertrgb
VideoCapture/DSHOW : Allow to set CAP_PROP_CONVERT_RGB before FOURCC/FPS/CHANNEL/WIDTH/HEIGHT.
* 🐛 cap_dshow : Allow to set CAP_PROP_CONVERT_RGB before FOURCC/FPS/CHANNEL
* 🐛 cap_dshow : fix g_VI.setConvertRGB not being called with correct boolean value on first property set.
* ✅ cap_dshow : Test CAP_PROP_CONVERT_RGB persistence
* 🚨 Fix cast from bool to double
* 🚨 Fix trailing whitespace
Alexander Alekhin [Fri, 29 Jan 2021 06:44:36 +0000 (06:44 +0000)]
Merge pull request #19384 from mshabunin:support-onetbb
Maksim Shabunin [Tue, 26 Jan 2021 12:52:46 +0000 (15:52 +0300)]
MKL-TBB: removed tbb from dependencies list
Maksim Shabunin [Sun, 24 Jan 2021 01:12:40 +0000 (04:12 +0300)]
core, gapi: supported build with oneTBB 2021
Alexander Alekhin [Thu, 28 Jan 2021 15:17:36 +0000 (15:17 +0000)]
Merge pull request #19413 from alalek:videoio_plugins_capture_params
Alexander Alekhin [Thu, 28 Jan 2021 06:00:38 +0000 (06:00 +0000)]
videoio(plugins): support VideoCaptureParameters, CAPTURE_API_VERSION=1
- example: ffmpeg
MaximMilashchenko [Wed, 27 Jan 2021 22:07:43 +0000 (01:07 +0300)]
Merge pull request #19394 from MaximMilashchenko:params
add video capture parameters
* add parameters
* videoio: revert unnecessary massive changes
* videoio: support capture parameters in backends API
- add tests
- FFmpeg backend sample code
- StaticBackend API is done
- support through PluginBackend API will be added later
Co-authored-by: Milashchenko <maksim.milashchenko@intel.com>
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Wed, 27 Jan 2021 18:32:33 +0000 (18:32 +0000)]
Merge pull request #19404 from LupusSanctus:am/text_graph_preproc
Alexander Alekhin [Wed, 27 Jan 2021 18:12:15 +0000 (18:12 +0000)]
Merge pull request #19365 from alalek:parallel_api
Anastasia Murzova [Tue, 26 Jan 2021 21:59:10 +0000 (00:59 +0300)]
Corrected SSD text graph generation
Alexander Alekhin [Thu, 21 Jan 2021 11:03:17 +0000 (11:03 +0000)]
core: parallel backends API
- allow to replace parallel_for() backend
Ixarias [Mon, 25 Jan 2021 19:34:57 +0000 (13:34 -0600)]
Change Keymap wording for gray image in curve mode
Instead of being a copy of line 76, line 79 instead correctly indicates that it will show a histogram for a gray image in curve mode, as given by the code block at line 103 referencing image "gray" instead of image "im".
Alexander Alekhin [Tue, 26 Jan 2021 19:23:12 +0000 (19:23 +0000)]
Merge pull request #19403 from diablodale:fix_19402_python_test_filter_34
Dale Phurrough [Tue, 26 Jan 2021 17:32:20 +0000 (18:32 +0100)]
fix python test runner wildcard handling
* fix opencv/opencv#19402
Anastasia M [Tue, 26 Jan 2021 11:06:15 +0000 (14:06 +0300)]
Merge pull request #17604 from LupusSanctus:am/pytorch_tf_cls_tutorial
[GSoC] Added TF and PyTorch classification conversion cases
* Added TF and PyTorch classification conversion cases
* Modified structure, some processing scripts. Added evaluation pipeline
* Minor structure change
* Removed extra functions, minor structure change
* Modified structure, code corrections
* Updated classification code block, added classification tutorials
* Added minor modifications of paths
* Classification block corrections in accordance with comments
Alexander Alekhin [Mon, 25 Jan 2021 22:34:41 +0000 (22:34 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 25 Jan 2021 22:08:24 +0000 (22:08 +0000)]
Merge pull request #19373 from l-bat:lb/tf_matmul_shared
Liubov Batanina [Mon, 25 Jan 2021 22:07:50 +0000 (01:07 +0300)]
Merge pull request #19372 from l-bat:lb/onnx_pads_calc
* Fixed bug with constant Div
* Supported constant mul and div for inputs with different shapes
Alexander Alekhin [Mon, 25 Jan 2021 13:54:00 +0000 (13:54 +0000)]
Merge pull request #19385 from alalek:ocl_isOpenCLActivated_update
Alexander Alekhin [Mon, 25 Jan 2021 13:32:42 +0000 (13:32 +0000)]
Merge pull request #19390 from tomoaki0705:fixCudaLegacyCalib3d
Alexander Alekhin [Mon, 25 Jan 2021 13:29:28 +0000 (13:29 +0000)]
Merge pull request #19388 from GArik:orbbec
Alexander Alekhin [Mon, 25 Jan 2021 08:22:57 +0000 (08:22 +0000)]
Merge pull request #19344 from VadimLevin:dev/vlevin/generic-sequence-conversion
Tomoaki Teshima [Mon, 25 Jan 2021 08:14:37 +0000 (17:14 +0900)]
fix peaky test failure
* follow the review comment
Vadim Levin [Mon, 18 Jan 2021 13:09:11 +0000 (16:09 +0300)]
feat: common fixed size sequence conversion for Python bindings
ZhM [Sun, 24 Jan 2021 22:22:25 +0000 (06:22 +0800)]
Merge pull request #19078 from zihaomu:dasiamrpn_tracker_c_plus_plus
Add DaSiamRPN tracker sample of c++ version
* add sample dasiamrpn_tracker of c++ version.
* samples(dasiamrpn_tracker.cpp): apply clang-format
- exclude "keys" variable
* samples(dasiamrpn_tracker.cpp): coding style and UX fixes
Alexander Alekhin [Sun, 24 Jan 2021 22:19:28 +0000 (22:19 +0000)]
Merge pull request #19380 from alalek:python_fix_rect_conversion
Igor Murzov [Wed, 23 Dec 2020 10:01:25 +0000 (13:01 +0300)]
Small corrections to Orbbec Astra cameras tutorial
Orest Chura [Sun, 24 Jan 2021 15:41:04 +0000 (18:41 +0300)]
Merge pull request #19337 from OrestChura:oc/fLine_fCont_perftests
[G-API]: Performance tests for fitLine and findContours
* Perf.Test for findContours(H)
* Perf.Test for fitLine(2D.3D;Mat,vector<Point2i/2f/2d/3i/3f/3d>)
* Reducing the template specializations number
* Applying comments
Alexander Alekhin [Sun, 24 Jan 2021 15:23:34 +0000 (15:23 +0000)]
Merge pull request #19383 from tomoaki0705:fixWrongIndex
Alexander Alekhin [Sun, 24 Jan 2021 15:23:03 +0000 (15:23 +0000)]
Merge pull request #19382 from crackwitz:highgui-w32-remove-gutter
Tomoaki Teshima [Sun, 24 Jan 2021 11:29:52 +0000 (20:29 +0900)]
fix wrong index
Alexander Alekhin [Sun, 24 Jan 2021 01:24:32 +0000 (01:24 +0000)]
core(ocl): update isOpenCLActivated()
- reuse g_isOpenCLAvailable variable instead
Christoph Rackwitz [Sat, 23 Jan 2021 15:01:07 +0000 (16:01 +0100)]
highgui: remove gutter in window_w32
Alexander Alekhin [Sat, 23 Jan 2021 01:58:45 +0000 (01:58 +0000)]
python: handle errors in Rect conversions
Alexander Alekhin [Fri, 22 Jan 2021 20:27:40 +0000 (20:27 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 22 Jan 2021 20:22:36 +0000 (20:22 +0000)]
Merge pull request #19376 from alalek:fixup_19105
Alexander Alekhin [Fri, 22 Jan 2021 20:05:58 +0000 (20:05 +0000)]
Merge pull request #19334 from alalek:fix_19134
Alexander Alekhin [Fri, 22 Jan 2021 19:50:25 +0000 (19:50 +0000)]
js(doc): fix path
Alexander Alekhin [Fri, 22 Jan 2021 19:18:14 +0000 (19:18 +0000)]
Merge pull request #19364 from asmorkalov:as/capture_buffer_safety_test
Liubov Batanina [Fri, 22 Jan 2021 13:47:02 +0000 (16:47 +0300)]
Added shared weights for MatMul
Alexander Smorkalov [Thu, 21 Jan 2021 08:57:45 +0000 (11:57 +0300)]
VideoCapture test to ensure that cv::VideoCapture does not share output buffers between frames.
Sergei Slashchinin [Thu, 21 Jan 2021 22:16:56 +0000 (01:16 +0300)]
Merge pull request #19058 from sl-sergei:cuda_1d
Conv1D and Pool1D for CUDA backend
* CUDA-independent changes
* Add Conv1D and Pool1D for CUDA backend
* CUDA-independent changes
* Fix typo
* fix comment
* Update fix
* make changes more correct for pooling layer
* Minor fixes for review
* Split skip blocks
Alexander Alekhin [Wed, 20 Jan 2021 22:46:05 +0000 (22:46 +0000)]
Merge pull request #19355 from alalek:fixup_19050
Alexander Alekhin [Tue, 19 Jan 2021 22:29:36 +0000 (22:29 +0000)]
Merge pull request #19353 from mshabunin:new-forum-links-master
Alexander Alekhin [Tue, 19 Jan 2021 22:10:05 +0000 (22:10 +0000)]
gapi: fix build warning
Alexander Alekhin [Tue, 19 Jan 2021 21:56:42 +0000 (21:56 +0000)]
Merge pull request #19352 from mshabunin:new-forum-links
Alexander Alekhin [Tue, 19 Jan 2021 21:52:14 +0000 (21:52 +0000)]
Merge pull request #19345 from Ryyyc:patch-1
Maksim Shabunin [Tue, 19 Jan 2021 18:54:05 +0000 (21:54 +0300)]
Updated 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
Alexander Alekhin [Mon, 18 Jan 2021 20:35:41 +0000 (20:35 +0000)]
Merge pull request #19340 from tomoaki0705:fixStitchingExposure
Alexander Alekhin [Mon, 18 Jan 2021 20:16:04 +0000 (20:16 +0000)]
Merge pull request #19336 from kyshel:patch-1
Alexander Alekhin [Mon, 18 Jan 2021 20:14:57 +0000 (23:14 +0300)]
Merge pull request #19320 from alalek:videoio_plugins_api_split_capture_write
videoio(plugins): split capture and writer APIs
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
Ruan [Mon, 18 Jan 2021 15:56:34 +0000 (23:56 +0800)]
Update essential_mat_reconstr.cpp
A small clerical error of an author. The correct expression should be "xy += x_*y_;".
Vadim Levin [Tue, 12 Jan 2021 14:50:07 +0000 (17:50 +0300)]
feat: add overload resolution exception for Python bindings
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()
Alexander Alekhin [Fri, 15 Jan 2021 17:58:57 +0000 (17:58 +0000)]
core(ocl): fix lifetime handling of Image kernel args
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
Tomoaki Teshima [Sun, 17 Jan 2021 21:03:43 +0000 (06:03 +0900)]
workaround the test failure
Alexander Alekhin [Sun, 17 Jan 2021 19:20:18 +0000 (19:20 +0000)]
Merge pull request #19331 from alalek:gapi_lazy_initialization_kernel_intrinsics
Alexander Alekhin [Sun, 17 Jan 2021 19:19:48 +0000 (19:19 +0000)]
Merge pull request #19326 from alalek:gapi_async_service_lazy_initialization
shioko [Sun, 17 Jan 2021 18:59:20 +0000 (18:59 +0000)]
fix typo of the word storage
Alexander Alekhin [Sat, 16 Jan 2021 19:03:42 +0000 (19:03 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 16 Jan 2021 18:58:02 +0000 (18:58 +0000)]
Merge pull request #19332 from alalek:xcode_ccache
Alexander Alekhin [Sat, 16 Jan 2021 18:42:19 +0000 (18:42 +0000)]
Merge pull request #19330 from l-bat:lb/onnx_mish_subgraph
Alexander Alekhin [Fri, 15 Jan 2021 19:25:55 +0000 (19:25 +0000)]
cmake: support ccache with Xcode generator
Alexander Alekhin [Fri, 15 Jan 2021 10:14:52 +0000 (10:14 +0000)]
gapi: avoid global static initializers
- use lazy on-demand initialization
Liubov Batanina [Fri, 15 Jan 2021 11:01:48 +0000 (14:01 +0300)]
Added Mish ONNX subgraph
Alexander Alekhin [Fri, 15 Jan 2021 04:47:54 +0000 (04:47 +0000)]
gapi(async): use lazy-initialization of async_service singleton
Alexander Alekhin [Thu, 14 Jan 2021 12:08:10 +0000 (12:08 +0000)]
Merge pull request #19321 from alalek:fixup_19027
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.
Alexander Alekhin [Thu, 14 Jan 2021 10:44:41 +0000 (10:44 +0000)]
Merge pull request #19050 from anton-potapov:fix_range_var_clang_warnings
Alexander Alekhin [Thu, 14 Jan 2021 10:36:10 +0000 (10:36 +0000)]
videoio: fix API/ABI_VERSION macros before plugin_api.hpp
Alexander Alekhin [Wed, 13 Jan 2021 22:53:56 +0000 (22:53 +0000)]
videoio: split capture/writer plugin APIs
- migrate GStreamer backed
- migrate FFmpeg backend (with switch on legacy API)
- cv_videoio_capture_retrieve_cb_t uses Mat type instead of number of channels
Alexander Alekhin [Wed, 13 Jan 2021 22:37:21 +0000 (22:37 +0000)]
videoio: preserve git history in plugin_*.hpp files
Alexander Alekhin [Wed, 13 Jan 2021 20:00:32 +0000 (20:00 +0000)]
videoio: mv plugin_api.hpp (preserve git history)
Alexander Alekhin [Wed, 13 Jan 2021 22:25:37 +0000 (22:25 +0000)]
videoio: preserve git history in backend_plugin_legacy.impl.hpp
Alexander Alekhin [Wed, 13 Jan 2021 22:16:52 +0000 (22:16 +0000)]
videoio: backup backend_plugin_legacy.impl.hpp
Alexander Alekhin [Wed, 13 Jan 2021 14:22:41 +0000 (14:22 +0000)]
Merge pull request #19108 from ReID-Team:sample_person_reid
mznw [Thu, 10 Dec 2020 08:19:21 +0000 (16:19 +0800)]
sample of person ReIDentification.
Orest Chura [Tue, 12 Jan 2021 21:33:05 +0000 (00:33 +0300)]
Merge pull request #19215 from OrestChura:oc/bRect_perftests
[G-API]: Performance tests for boundingRect
* Update boundingRect() tests with the changes from fitLine() PR
* Add performance tests for boundingRect
* Applying comment about g_type_of_t
* Addressing comments
* Addressing comment: replace cmp_f by CompareF in perf.tests + add the default constructor for CompareF
* Fix typo
Maxim Pashchenkov [Tue, 12 Jan 2021 21:31:15 +0000 (00:31 +0300)]
Merge pull request #18902 from mpashchenkov:mp/onnx-const-input
G-API: ONNX. Const input
* Added const input for ONNX backend
* Returned initMatrixRandu, added some comments, rebase
Alexander Alekhin [Tue, 12 Jan 2021 18:34:33 +0000 (18:34 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 12 Jan 2021 18:28:58 +0000 (18:28 +0000)]
Merge pull request #19300 from alkasm:patch-2
Alexander Alekhin [Tue, 12 Jan 2021 17:57:24 +0000 (17:57 +0000)]
Merge pull request #19216 from terfendail:wasm_fall
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
Alexander Alekhin [Mon, 11 Jan 2021 20:58:33 +0000 (20:58 +0000)]
Merge pull request #19301 from krush11:3.4
Alexander Alekhin [Mon, 11 Jan 2021 20:54:53 +0000 (20:54 +0000)]
Merge pull request #19297 from raaldrid:Template_Match_Tutorial_fix_17739
Alexander Alekhin [Mon, 11 Jan 2021 20:04:49 +0000 (20:04 +0000)]
Merge pull request #19296 from raaldrid:Doc_issue_fix_18836_FULL