Alexander Alekhin
9d227641c9
Merge pull request #19411 from crackwitz:highgui-pollkey
2021-02-05 20:18:53 +00:00
Alexander Alekhin
2a2e4e78bf
Merge pull request #19451 from alalek:cmake_mkl_tbb_oneapi_workaround
2021-02-05 14:22:43 +00:00
Anna Khakimova
fb3b297369
Merge pull request #18466 from anna-khakimova:ak/simd_addw_bitwise
...
GAPI: SIMD optimization for AddWeighted kernel.
* Add, sub, absdiff kernels optimization
* AddW kernel
* And, or kernels
* AddWeighted refactoring and SIMD opt for AbsDiffC kernel
* Remove simd opt of AbsDiffC kernel
* Refactoring
* Applied comments
* Refactoring.Step2
* Applied comments.Step2
2021-02-05 14:21:42 +00:00
Alexander Alekhin
050327a1e2
Merge pull request #19456 from alalek:fixup_19447
2021-02-04 16:03:24 +00:00
Alexander Alekhin
fcff767a7f
cmake(tbb): fix target_compile_definitions() with "UNKNOWN" target
...
- https://gitlab.kitware.com/cmake/cmake/-/issues/19434
2021-02-03 22:18:39 +00:00
Alexander Alekhin
7a282a8892
cmake: workaround oneAPI problem with -DMKL_WITH_TBB=ON
2021-02-03 19:41:54 +00:00
Alexander Alekhin
3e34cec96b
Merge pull request #19408 from crackwitz:ogl-wndprop-vsync
2021-02-03 09:56:57 +00:00
Alexander Alekhin
6ca46afa63
Merge pull request #19286 from diablodale:add-cuda-stream-constructor
2021-02-03 09:55:02 +00:00
Christoph Rackwitz
ab0e1c573a
highgui: expose VSYNC window property for OpenGL on W32
...
property getter/setter code conditional on HAVE_OPENGL
getter: return -1 upon specific OpenGL errors
2021-02-03 09:53:13 +01:00
Christoph Rackwitz
26da491053
implementation of pollKey, companion to waitKey
...
w32 backend: implemented
other backends: stubbed or fallback to waitKey
documentation: cross-linked and more precise in some places
2021-02-02 22:24:54 +01:00
Alexander Alekhin
674ecc5581
Merge pull request #19447 from alalek:cmake_tbb_workaround_msvc
2021-02-02 20:33:26 +00:00
Alexander Alekhin
eced4dd023
cmake: workaround oneTBB build issues with MSVC
2021-02-02 15:03:27 +00:00
LaurentBerger
94e1126678
Merge pull request #19423 from LaurentBerger:houg_acc
...
Return accumulator value in HoughLines algorithm
* try to solve #17050
use cv_wrap_as
add python test
parameters
* review
* move wrapper to imgproc/bindings.hpp
2021-02-01 21:22:10 +00:00
Alexander Alekhin
2b787eb4b8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-01-31 17:44:15 +00:00
Alexander Alekhin
5ab4623c2a
Merge pull request #19430 from alalek:fixup_19216
2021-01-31 17:41:24 +00:00
Alexander Alekhin
cdf73f2e05
Merge pull request #19427 from alalek:issue_19426
2021-01-31 14:24:37 +00:00
Alexander Alekhin
30bef20e22
js: fix SIMD build
2021-01-31 00:12:51 +00:00
Alexander Alekhin
4be077163f
Merge pull request #19424 from alalek:cmake_linters_update
2021-01-30 12:37:57 +00:00
Alexander Alekhin
b9dfffc237
Merge pull request #19057 from sl-sergei:changes_for_cuda_1d
2021-01-30 11:39:43 +00:00
Alexander Alekhin
c5bf15e009
build: fix cv2.cpp compilation
2021-01-30 11:32:27 +00:00
Sergey Slashchinin
e2949c7d0a
Align 3.4 branch with master
2021-01-29 23:48:08 +03:00
Alexander Alekhin
e448f4f6ef
cmake: fix pylint/flake8 detection, update flake8 exclude
2021-01-29 17:06:54 +00:00
Maxim Pashchenkov
e250bae356
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
2021-01-29 14:53:42 +00:00
Alexander Alekhin
ebd91459f2
Merge pull request #19395 from Ixarias:patch-1
2021-01-29 12:34:00 +00:00
Olivier Le Doeuff
4c7f56263e
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
2021-01-29 10:18:09 +00:00
Alexander Alekhin
6be9496d73
Merge pull request #19384 from mshabunin:support-onetbb
2021-01-29 06:44:36 +00:00
Maksim Shabunin
46b2da409b
MKL-TBB: removed tbb from dependencies list
2021-01-29 02:38:05 +03:00
Maksim Shabunin
694fe3e7d2
core, gapi: supported build with oneTBB 2021
2021-01-29 02:38:05 +03:00
Alexander Alekhin
900051cd04
Merge pull request #19413 from alalek:videoio_plugins_capture_params
2021-01-28 15:17:36 +00:00
Dale Phurrough
34c3f0f495
add cuda::Stream constructor with cuda flags
2021-01-28 16:14:01 +01:00
Alexander Alekhin
e705414bea
videoio(plugins): support VideoCaptureParameters, CAPTURE_API_VERSION=1
...
- example: ffmpeg
2021-01-28 06:09:23 +00:00
MaximMilashchenko
467870415b
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>
2021-01-27 22:07:43 +00:00
Alexander Alekhin
ff8a624189
Merge pull request #19404 from LupusSanctus:am/text_graph_preproc
2021-01-27 18:32:33 +00:00
Alexander Alekhin
37c12db366
Merge pull request #19365 from alalek:parallel_api
2021-01-27 18:12:15 +00:00
Anastasia Murzova
449ebc1b70
Corrected SSD text graph generation
2021-01-27 19:53:52 +03:00
Alexander Alekhin
b73bf03bfc
core: parallel backends API
...
- allow to replace parallel_for() backend
2021-01-27 14:15:33 +00:00
Ixarias
3f14341629
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".
2021-01-26 16:30:50 -06:00
Alexander Alekhin
ca9cbab532
Merge pull request #19403 from diablodale:fix_19402_python_test_filter_34
2021-01-26 19:23:12 +00:00
Dale Phurrough
5c70a2015f
fix python test runner wildcard handling
...
* fix opencv/opencv#19402
2021-01-26 19:05:40 +01:00
Anastasia M
8c221981bf
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
2021-01-26 11:06:15 +00:00
Alexander Alekhin
e85b41f9be
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-01-25 22:42:13 +00:00
Alexander Alekhin
573812d0ff
Merge pull request #19373 from l-bat:lb/tf_matmul_shared
2021-01-25 22:08:24 +00:00
Liubov Batanina
c12930cdde
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
2021-01-25 22:07:50 +00:00
Alexander Alekhin
857f339914
Merge pull request #19385 from alalek:ocl_isOpenCLActivated_update
2021-01-25 13:54:00 +00:00
Alexander Alekhin
b1ffe7a153
Merge pull request #19390 from tomoaki0705:fixCudaLegacyCalib3d
2021-01-25 13:32:43 +00:00
Alexander Alekhin
f54f6627c3
Merge pull request #19388 from GArik:orbbec
2021-01-25 13:29:28 +00:00
Alexander Alekhin
62b60b11bb
Merge pull request #19344 from VadimLevin:dev/vlevin/generic-sequence-conversion
2021-01-25 08:22:57 +00:00
Tomoaki Teshima
96e0902f39
fix peaky test failure
...
* follow the review comment
2021-01-25 17:14:37 +09:00
Vadim Levin
1d3207d7c7
feat: common fixed size sequence conversion for Python bindings
2021-01-25 08:08:38 +03:00
ZhM
13a1105318
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
2021-01-24 22:22:25 +00:00