Alexander Alekhin
0c31c0756c
Merge pull request #19468 from hmaarrfk:fix_apple_check
2021-02-06 14:54:49 +00:00
Mark Harfouche
7405075ede
CHange import order to avoid apple check error
2021-02-05 23:24:56 -05:00
Alexander Alekhin
6b474c4051
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-02-06 00:44:11 +00:00
Alexander Alekhin
a9c954e821
Merge pull request #19467 from alalek:hotfix_19411
2021-02-06 00:42:26 +00:00
Alexander Alekhin
b6933dbf3a
highgui(pollKey): properly handle no-GUI case
2021-02-05 23:51:52 +00:00
Alexander Alekhin
f46b1252c4
Merge pull request #19466 from alalek:hotfix_19259
2021-02-05 23:46:24 +00:00
Alexander Alekhin
e6959055b5
core(cuda.hpp): fix GpuMatND compilation with GCC < 5
2021-02-05 22:42:56 +00:00
Polina Smolnikova
0be18f5cb0
Merge pull request #19407 from rayonnant14:issue_19363
...
QRCodeDetector::decodeMulti() fixed invalid usage fixedType()
* fixed invalid usage fixedType()
changed default barcode type to CV_8UC1
added tests
added assert in case multi channel straight barcode input
* deleted extra wrap into OutputArray
* fix warnings
* objdetect(qr): remove unnecessary checks
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2021-02-05 21:24:27 +00:00
Namgoo Lee
7ea21c4b3c
Merge pull request #19259 from nglee:dev_gpumatnd1
...
Minimal implementation of GpuMatND
* GpuMatND - minimal implementation
* GpuMatND - createGpuMatHeader
* GpuMatND - GpuData, offset, getDevicePtr(), license
* reviews
* reviews
2021-02-05 20:30:37 +00:00
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
4f08bb5046
Merge pull request #19428 from alalek:dnn_drop_misbehaved_clamp
2021-02-04 11:57:19 +00:00
Jebastin Nadar
09d2ca17cf
Merge pull request #19449 from SamFC10:tf-leakyrelu
...
* add LeakyRelu to tf-importer
* fix whitespace error
* added test for leakyrelu
2021-02-04 08:50:08 +00:00
Alexander Alekhin
83aa711346
dnn: rename clamp() => normalize_axis()
2021-02-04 08:13:55 +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
863ecded30
Merge pull request #19440 from paroj:pyexcept
2021-02-03 11:08:24 +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
Alexander Alekhin
0a86ddc36c
Merge pull request #19435 from l-bat:lb/onnx_normalize
2021-02-03 09:16:06 +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
Pavel Rojtberg
6c1a433c4c
python: also catch general c++ exceptions
...
they might be thrown from third-party code (notably Ogre in the ovis
module).
While Linux is kind enough to print them, they cause instant termination
on Windows.
Arguably, they do not origin from OpenCV itself, but still this helps
understanding what went wrong when calling an OpenCV function.
2021-02-02 21:16:01 +01:00
Alexander Alekhin
eced4dd023
cmake: workaround oneTBB build issues with MSVC
2021-02-02 15:03:27 +00:00
Alexander Alekhin
23734aff74
Merge pull request #19443 from asmorkalov:as/guard_nonfree
2021-02-02 11:12:14 +00:00
Alexander Smorkalov
0016c25b58
Guard non-free usage in stitching as contrib can be built without it.
2021-02-02 13:24:59 +03: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
Liubov Batanina
68eb54dc13
Added ONNX NormalizeL2 subgraph
2021-02-01 12:44:48 +03:00
Liangda-w
b08d67c4e1
Merge pull request #19419 from Liangda-w:patch-1
...
* Fix error in documentation for RGB->HSV convertion
* Update colors.markdown
2021-02-01 09:17:54 +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
Alexander Alekhin
1a5b411ae4
js(tutorial): add note about CVAT integration
2021-01-29 10:27:47 +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