Alexander Alekhin [Thu, 25 Feb 2021 07:55:38 +0000 (07:55 +0000)]
Merge pull request #19609 from alalek:videoio_fix_gstreamer_alignment_bug
Alexander Alekhin [Wed, 24 Feb 2021 21:03:01 +0000 (21:03 +0000)]
Merge pull request #19618 from alalek:videoio_plugin_exception_messages
Alexander Alekhin [Wed, 24 Feb 2021 17:45:19 +0000 (17:45 +0000)]
videoio: dump exception's messages in plugins
Alexander Alekhin [Wed, 24 Feb 2021 10:08:11 +0000 (10:08 +0000)]
Merge pull request #19610 from mshabunin:plugin-va-compile
Alexander Alekhin [Wed, 24 Feb 2021 09:28:47 +0000 (09:28 +0000)]
Merge pull request #19568 from alalek:cmake_plugin_fix_osx_standalone
Alexander Alekhin [Wed, 24 Feb 2021 08:40:42 +0000 (08:40 +0000)]
videoio(gstreamer): rework retrieveFrame() to handle strides
Maksim Shabunin [Sat, 20 Feb 2021 09:22:51 +0000 (12:22 +0300)]
Fix standalone plugin compilation for Windows
Maksim Shabunin [Sat, 20 Feb 2021 10:49:33 +0000 (13:49 +0300)]
Enable VA only on selected x86/64 platforms
Alexander Alekhin [Mon, 22 Feb 2021 08:29:10 +0000 (08:29 +0000)]
Merge pull request #19594 from alalek:hotfix_19470
Alexander Alekhin [Sun, 21 Feb 2021 21:22:29 +0000 (21:22 +0000)]
core(parallel): fix JS build, fix OpenMP version dump
Alexander Alekhin [Sun, 21 Feb 2021 20:14:09 +0000 (20:14 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Larry Wei [Sun, 21 Feb 2021 19:22:43 +0000 (03:22 +0800)]
Merge pull request #19586 from larryw3i:patch-2
* Update py_setup_in_ubuntu.markdown
Alexander Alekhin [Sun, 21 Feb 2021 19:20:03 +0000 (19:20 +0000)]
Merge pull request #19584 from diablodale:fix19573_ocl_move
Sergey Krivohatskiy [Sun, 21 Feb 2021 15:57:18 +0000 (18:57 +0300)]
Merge pull request #19580 from SergeyKrivohatskiy:patch-1
* Fixed OCL implementation of pyrlk
If prevPts size is (N, 1) (which is a default layout for converting `vector<Point2f>` to `UMat`) the `prevPts.cols == 1` and optical flow will be calculated for the first point only.
Getting `prevPts.total()` as in line 1048 is the correct way to get points count.
* fixed compilation warning (size_t to int)
Signed-off-by: Sergey Krivohatskiy <s.krivohatskiy@gmail.com>
Alexander Alekhin [Sat, 20 Feb 2021 22:54:55 +0000 (22:54 +0000)]
Merge pull request #19585 from alalek:hotfix_19540
Alexander Alekhin [Sat, 20 Feb 2021 22:47:35 +0000 (22:47 +0000)]
Merge pull request #19545 from SamFC10:exp
Alexander Alekhin [Sat, 20 Feb 2021 22:46:55 +0000 (22:46 +0000)]
Merge pull request #19582 from alalek:backport_19572
Alexander Alekhin [Sat, 20 Feb 2021 18:30:49 +0000 (18:30 +0000)]
build warning (windows 32-bit)
Dale Phurrough [Sat, 20 Feb 2021 17:56:04 +0000 (18:56 +0100)]
add move construct/assigns to cv::ocl main classes
- enables inline construct and assigns with r-values
- enables compiler-created default move
construct/assigns
- includes test cases
SamFC10 [Sat, 20 Feb 2021 16:46:00 +0000 (22:16 +0530)]
Added exp layer
Alexander Smorkalov [Sat, 20 Feb 2021 16:28:08 +0000 (19:28 +0300)]
Merge pull request #19540 from asmorkalov:as/openexr_comression_options
OpenEXR compression options
* Adding possibility to select the compression type for the OpenEXR format.
There are compression modes other than the default that are more suited for certain data. Mainly grainy/noisy data.
* Code review fixes.
Co-authored-by: Daniel Rydstrom <daniel.rydstrom@sick.se>
Dale Phurrough [Sat, 20 Feb 2021 13:16:47 +0000 (14:16 +0100)]
add noexcept to default constructors of cv::ocl
- follows iso c++ guideline C.44
- enables default compiler-created constructors to
also be noexcept
original commit:
77e26a7db3447b7569dfee28fb8a253b8ed93e2b
- handled KernelArg, Image2D
Alexander Alekhin [Sat, 20 Feb 2021 15:59:38 +0000 (15:59 +0000)]
Merge pull request #19572 from diablodale:fix19571_ocl_noexcept
Dale Phurrough [Sat, 20 Feb 2021 13:16:47 +0000 (14:16 +0100)]
add noexcept to default constructors of cv::ocl
- follows iso c++ guideline C.44
- enables default compiler-created constructors to
also be noexcept
Alexander Alekhin [Fri, 19 Feb 2021 16:23:33 +0000 (16:23 +0000)]
cmake(plugins): build without opencv_*.so on OSX
Alexander Alekhin [Fri, 19 Feb 2021 11:53:04 +0000 (11:53 +0000)]
Merge pull request #19561 from mshabunin:plugin-load-now
Alexander Alekhin [Fri, 19 Feb 2021 11:45:00 +0000 (11:45 +0000)]
Merge pull request #19562 from alalek:libva_dynamic
Alexander Alekhin [Fri, 19 Feb 2021 11:03:31 +0000 (11:03 +0000)]
Merge pull request #19541 from alalek:core_includes
Alexander Alekhin [Fri, 19 Feb 2021 10:36:26 +0000 (10:36 +0000)]
samples(va): fix build warnings, use cv::format()
Alexander Alekhin [Thu, 18 Feb 2021 13:36:07 +0000 (13:36 +0000)]
core(libva): use dynamic loader
Alexander Alekhin [Thu, 18 Feb 2021 19:42:08 +0000 (19:42 +0000)]
Merge pull request #19560 from mshabunin:va-sample-fix
Alexander Alekhin [Thu, 18 Feb 2021 19:41:21 +0000 (19:41 +0000)]
Merge pull request #19534 from tomoaki0705:fixCudaFiltersRace
Alexander Alekhin [Thu, 18 Feb 2021 15:33:02 +0000 (15:33 +0000)]
Merge pull request #19559 from APrigarina:calib3d_fix
Maksim Shabunin [Thu, 18 Feb 2021 14:19:47 +0000 (17:19 +0300)]
VA sample: device autodetection changed
APrigarina [Thu, 18 Feb 2021 13:18:19 +0000 (16:18 +0300)]
handle empty cameraMatrix
Maksim Shabunin [Thu, 18 Feb 2021 11:45:08 +0000 (14:45 +0300)]
plugins: use RTLD_NOW instead of RTLD_LAZY
Anastasia M [Wed, 17 Feb 2021 18:01:41 +0000 (21:01 +0300)]
Merge pull request #19417 from LupusSanctus:am/text_graph_identity
* Corrected SSD text graph generation for Identity nodes
* Added minor code corrections
Alexander Alekhin [Wed, 17 Feb 2021 17:10:44 +0000 (17:10 +0000)]
Merge pull request #19474 from aryanshomray:darknet_tanh
Liangqian [Wed, 17 Feb 2021 17:05:08 +0000 (01:05 +0800)]
Merge pull request #19026 from chargerKong:dualquat
Dual quaternion
* create dual quaternion;
basic operations, functions(exp,log,norm,inv), to/from mat, sclerp.
* add dqb, dqs, gdqb, to/from affine3;
change algorithm of norm, inv, getTranslation, createFromPitch, normalize;
change type translation to Vec3;
comment improve;
* try fix warning: unreferenced local function
* change exp calculation;
add func(obj) operations;
* Change the algorithm of log function;
add assumeUnit in getRotation;
remove dqs;
change std::vector to InputArray
* fix warning: doxygen and Vec<double, 0>
* fix warning: doxygen and Vec<double, 0>
* add inputarray param for gdqb
* change int to size_t
* win cl warning fix
* replace size_t by int at using Mat.at() function
* replace double by float
* interpolation fix
* replace (i, 0) to (i)
* core(quat): exclude ABI, test_dualquaternion=>test_quaternion.cpp
Co-authored-by: arsaratovtsev <arsaratovtsev@intel.com>
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Andrey Golubev [Wed, 17 Feb 2021 15:23:29 +0000 (17:23 +0200)]
Merge pull request #19496 from andrey-golubev:master
[G-API] Change memory measurement statistic in Fluid tests
* Change memory measurement statistic in Fluid tests
* Delete irrelevant comment
Aryansh Omray [Wed, 17 Feb 2021 13:19:52 +0000 (18:49 +0530)]
TanH darknet and test
Anatoliy Talamanov [Wed, 17 Feb 2021 11:43:18 +0000 (14:43 +0300)]
Merge pull request #19533 from TolyaTalamanov:at/async-requests-hotfix
[G-API] Async infer request hotfix
* Fix hanging on empty roi list
* Prevent possible data race
* Clean up
Alexander Alekhin [Wed, 17 Feb 2021 10:19:20 +0000 (10:19 +0000)]
Merge pull request #19550 from Nico769:patch-1
Nicola Landolfi [Wed, 17 Feb 2021 09:03:16 +0000 (10:03 +0100)]
Fix single-word typo
Matt Alvarado [Tue, 16 Feb 2021 16:18:43 +0000 (11:18 -0500)]
Merge pull request #19498 from mattalvarado:fix_findcirclesgrid
* Properly handle empty centers in findCirclesGrid
* Address alalek comments. Add unit test to validate bugfix
* fix build warnings, remove unrelated comment
Alexander Alekhin [Tue, 16 Feb 2021 16:05:09 +0000 (16:05 +0000)]
Merge pull request #19543 from alalek:hotfix_19439
Alexander Alekhin [Tue, 16 Feb 2021 12:32:58 +0000 (12:32 +0000)]
imgcodecs(test): don't include png.h
Alexander Alekhin [Tue, 16 Feb 2021 11:12:05 +0000 (11:12 +0000)]
Merge pull request #19470 from alalek:core_parallel_plugins
Alexander Alekhin [Tue, 16 Feb 2021 10:06:31 +0000 (10:06 +0000)]
core: include version.hpp in cvdef.h, fix precomp.hpp usage
Alexander Alekhin [Mon, 15 Feb 2021 20:00:11 +0000 (23:00 +0300)]
Merge pull request #19528 from smirnov-alexey:as/gapi_optional_fix
Dan Ben-Yosef [Mon, 15 Feb 2021 19:58:37 +0000 (21:58 +0200)]
Merge pull request #19525 from danbey:Fix-cppcheck-error-in-carotete-lib
* Reduce if statement as it has the same expression on both sides of '&&'
If statement has the same expression on both sides so this can be reduce
Signed-off-by: Dan Ben Yosef <danbey@gmail.com>
* The if statement is to check width and height
Dmitry Budnikov [Mon, 15 Feb 2021 19:57:22 +0000 (22:57 +0300)]
Merge pull request #19516 from dbudniko:dbudniko/gapi_render_frame_cpu
Render Frame NV12 on CPU
* render frame on CPU
* doxygen fix
* address review from Alexey
* comment fixes
* Address comments from Ruslan
* remove NV12 specific
* mat clone and more renaming
* misprint fix
Amir Tulegenov [Mon, 15 Feb 2021 19:55:57 +0000 (01:55 +0600)]
Merge pull request #19392 from amirtu:OCV-165_finalize_goodFeaturesToTrack_returns_also_corner_value_PR
* goodFeaturesToTrack returns also corner value
(cherry picked from commit
4a8f06755cf93785a82a455a2035a2ff572cafae)
* Added response to GFTT Detector keypoints
(cherry picked from commit
b88fb40c6ea037e5283e4fbcf0ffde160c65a035)
* Moved corner values to another optional variable to preserve backward compatibility
(cherry picked from commit
6137383d32859efad7b44dd8a798e7b69f68dec5)
* Removed corners valus from perf tests and better unit tests for corners values
(cherry picked from commit
f3d0ef21a78b7d0dc8696c457a6fabecfbe5e8ff)
* Fixed detector gftt call
(cherry picked from commit
be2975553ba01a7d2e63f549fadccec6d7d56797)
* Restored test_cornerEigenValsVecs
(cherry picked from commit
ea3e11811faee63487449983c0b80ff8ee35bbac)
* scaling fixed;
mineigen calculation rolled back;
gftt function overload added (with quality parameter);
perf tests were added for the new api function;
external bindings were added for the function (with different alias);
fixed issues with composition of the output array of the new function (e.g. as requested in comments) ;
added sanity checks in the perf tests;
removed C API changes.
* minor change to GFTTDetector::detect
* substitute ts->printf with EXPECT_LE
* avoid re-allocations
Co-authored-by: Anas <anas.el.amraoui@live.com>
Co-authored-by: amir.tulegenov <amir.tulegenov@xperience.ai>
Alexander Alekhin [Wed, 3 Feb 2021 22:04:35 +0000 (22:04 +0000)]
core(parallel): plugins support
Alexander Alekhin [Mon, 15 Feb 2021 15:33:54 +0000 (15:33 +0000)]
Merge pull request #19532 from amirtu:OCV-166_getDefaultName_overload
Alexander Alekhin [Mon, 15 Feb 2021 15:15:27 +0000 (15:15 +0000)]
Merge pull request #19519 from alalek:issue_19485
amir.tulegenov [Mon, 15 Feb 2021 09:19:23 +0000 (15:19 +0600)]
fix getDefaultName()
Tomoaki Teshima [Mon, 15 Feb 2021 12:01:41 +0000 (21:01 +0900)]
remove danger race condition
Smirnov Alexey [Sun, 14 Feb 2021 21:20:08 +0000 (00:20 +0300)]
Fix optional move constructor
Zhuo Zhang [Sun, 14 Feb 2021 18:38:53 +0000 (02:38 +0800)]
Merge pull request #19522 from zchrissirhcz:3.4-fix-android-find-zlib-shared-since-ndk19
* fix find zlib.so instead of zlib.a when NDK >= 19
On Android platform, `libopencv_imgcodecs.a` is built, expected to
depend on `libz.so`. However, since Android NDK r19, NDK's `libz.a`
is found instead of `libz.so`, leading to link error
(not found libz.a) on machines without same NDK version & direcotry.
Since Android NDK-r19, toolchain pieces are installed to
`$NDK/toolchains/llvm/prebuilt/<host-tag>/...`, including `libz.so`.
Also installed to old paths (`<NDK>/platforms` and `<NDK>/sysroot`)
in NDK r19, r20, r21, but since NDK 22, old paths are removed.
- https://github.com/android/ndk/wiki/Changelog-r19
- https://github.com/android/ndk/wiki/Changelog-r22
With this commit, `libz.so` can be correctly found in NDK<19 and NDK>=19.
`ZLIB_LIBRARIES` is also simplified as `z`, by appending match (regex)
patterns for new toolchain installation directory's libz.so's paths.
* simplify libz.so match pattern for abbreviation
Zhuo Zhang [Sun, 14 Feb 2021 18:37:11 +0000 (02:37 +0800)]
Merge pull request #19521 from zchrissirhcz:3.4-fix-core-module-android-arm64-build
* fix core module android arm64 build
* fix core module android build when neon is off
When building for Android ARM platform, cmake with
`-D CV_DISABLE_OPTIMIZATION=ON`, the expected behavior is
not using ARM NEON, using naive computation instead.
This commit fix the un-expected compile error for neon intrinsincs.
Alexander Alekhin [Sun, 14 Feb 2021 12:41:33 +0000 (12:41 +0000)]
Merge pull request #19501 from komakai:android-ndk22
Alexander Alekhin [Sat, 13 Feb 2021 22:44:32 +0000 (22:44 +0000)]
Merge pull request #19523 from the-sparrow:master
Alexander Alekhin [Sat, 13 Feb 2021 00:35:18 +0000 (00:35 +0000)]
cmake: fix add_apple_compiler_options() calls and OBJCXX handling
Alexander Alekhin [Sat, 13 Feb 2021 18:18:11 +0000 (18:18 +0000)]
Merge pull request #19520 from WeiChungChang:refine
the-sparrow [Sat, 13 Feb 2021 09:08:56 +0000 (17:08 +0800)]
fix the spell error
Giles Payne [Sat, 13 Feb 2021 04:00:19 +0000 (13:00 +0900)]
Build for NDK 22
Qoo [Sat, 13 Feb 2021 00:12:05 +0000 (19:12 -0500)]
refine
Alexander Alekhin [Fri, 12 Feb 2021 21:20:54 +0000 (21:20 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 12 Feb 2021 20:28:52 +0000 (20:28 +0000)]
Merge pull request #19515 from zchrissirhcz:3.4-fix-mislinked-zlib-in-vcpkg-by-adjust-link-order
Zhuo Zhang [Fri, 12 Feb 2021 14:19:35 +0000 (22:19 +0800)]
fix link order: put zlib after png/tiff/openexr
Previous link dependency: imgcodecs --> zlib --> libpng
this can generate imgcodecs shared lib, until Visual Studio integrated
with vcpkg, which will additionally specify LIBPATH, pointing to vcpkg
installed zlib (if any), which links the wrong zlib.
Fixed link dependency: imgcodecs --> libpng --> zlib
in this fixed case, symbols in zlib referenced in libpng will be found
in the build-from-source static zlib, instead of the vcpkg one.
related discussion:
- https://github.com/microsoft/vcpkg/issues/16165
- https://github.com/opencv/opencv/issues/17051
- https://github.com/opencv/opencv/issues/10576
MSVC linking order reference pages:
- https://docs.microsoft.com/en-us/cpp/build/reference/link-input-files?view=msvc-160
for link order
- https://docs.microsoft.com/en-us/cpp/build/reference/linking?view=msvc-160
LIB environment variable, for library file searching
- https://docs.microsoft.com/en-us/cpp/build/reference/libpath-additional-libpath?view=msvc-160
LIBPATH option, for library file searching
Anatoliy Talamanov [Fri, 12 Feb 2021 12:28:37 +0000 (15:28 +0300)]
Merge pull request #19425 from TolyaTalamanov:at/async-infer
[G-API] Implement async infer
* Implement async infer
* Fix typo
Alexander Alekhin [Thu, 11 Feb 2021 18:52:56 +0000 (18:52 +0000)]
Merge pull request #19505 from alalek:hotfix_19456
Alexander Alekhin [Thu, 11 Feb 2021 13:47:17 +0000 (13:47 +0000)]
cmake: use INTERFACE_COMPILE_DEFINITIONS with definition
Francesco Petrogalli [Thu, 11 Feb 2021 13:24:09 +0000 (13:24 +0000)]
Merge pull request #19486 from fpetrogalli:dotprod_fast-3.4
* [hal][neon] Optimize the v_dotprod_fast intrinsics for aarch64.
On Armv8 in AArch64 execution mode, we can skip the sequence
v<op>_<ty>(vget_high_<ty>(x), vget_high_<ty>(y))
in favour of
v<op>_high_<ty>(x, y)
This has better changes for recent compilers to use less data movement
operations and better register allocation. See for example:
https://godbolt.org/z/bPq7vd
* [hal][neon] Fix build failure on armv7.
* [hal][neon] Address review comments in PR.
PR: https://github.com/opencv/opencv/pull/19486
* [hal][neon] Define macro to check for the AArch64 execution state of Armv8.
* [hal][neon] Fix macro definition for AArch64.
The fix is needed to prevent warnings when building for Armv7.
Alexander Alekhin [Wed, 10 Feb 2021 19:43:16 +0000 (19:43 +0000)]
Merge pull request #19494 from derbosper:js-build-config-fix
Tsukasa Sugiura [Wed, 10 Feb 2021 19:42:00 +0000 (04:42 +0900)]
Merge pull request #19484 from UnaNancyOwen:fix_highlevelapi
* [dnn] fix high level api for python
* [dnn] add test_textdetection_model_db
* [dnn] fix textdetection test only check type and shape
Cuntian Liu [Wed, 10 Feb 2021 19:38:34 +0000 (03:38 +0800)]
Merge pull request #19452 from ctuu:patch-1
* fix: findCUDNN script
* Update FindCUDNN.cmake
Alexander Alekhin [Wed, 10 Feb 2021 19:35:31 +0000 (19:35 +0000)]
Merge pull request #19439 from raaldrid:Exif_support_for_PNG_issue_16579
Dmitry Budnikov [Wed, 10 Feb 2021 19:23:54 +0000 (22:23 +0300)]
Merge pull request #19495 from dbudniko:gapi_media_frame_size
Add Media Frame size function and corresponding tests
* add media frame size and tests
* Address comments from Ruslan and Asya
Mieszko Boczkowski [Wed, 10 Feb 2021 10:42:29 +0000 (11:42 +0100)]
Pass custom config file path as absolute
Alexander Alekhin [Tue, 9 Feb 2021 22:48:59 +0000 (22:48 +0000)]
Merge pull request #19480 from vrabaud:3.4
Alexander Alekhin [Tue, 9 Feb 2021 20:38:30 +0000 (20:38 +0000)]
Merge pull request #19488 from asmorkalov:as/nonfree_check
Alexander Alekhin [Tue, 9 Feb 2021 18:57:43 +0000 (18:57 +0000)]
Merge pull request #19471 from sturkmen72:patch-5
Rachel A [Mon, 1 Feb 2021 20:16:44 +0000 (12:16 -0800)]
Exif parsing for PNG files to support Exif orientation tag. Moved decoder specific Exif parsing to JPEG and PNG decoders, respectively. Issue 16579
Anatoliy Talamanov [Tue, 9 Feb 2021 13:55:16 +0000 (16:55 +0300)]
Merge pull request #19319 from TolyaTalamanov:at/introduce-gopaque-garray-for-python
[G-API] Introduce GOpaque and GArray for python
* Introduce GOpaque and GArray for python
* Fix ctor
* Avoid code duplication by using macros
* gapi: move Python-specific files to misc/python
* Fix windows build
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Smorkalov [Tue, 9 Feb 2021 13:54:06 +0000 (16:54 +0300)]
Not not test stitiching with SURF, if NONFREE is disabled
Vincent Rabaud [Mon, 8 Feb 2021 15:53:37 +0000 (16:53 +0100)]
Disable thread sanitization when CV_USE_GLOBAL_WORKERS_COND_VAR is not set.
This fixes #19463
Ilya Churaev [Tue, 9 Feb 2021 09:46:28 +0000 (12:46 +0300)]
Merge pull request #19479 from ilyachur:remove_v0_multiply
* Switched to v1 Multiply
* Apply changes only for new OV
Anna Khakimova [Mon, 8 Feb 2021 13:02:35 +0000 (16:02 +0300)]
Merge pull request #19233 from anna-khakimova:ak/simd_absdiffc
GAPI: SIMD optimization for AbsDiffC kernel
* SIMD optimization for AbsDiffC kernel
* Applied comments
* Applying comments and refactoring: Remove new univ intrinsics.
* Performance experiment
* Applied comments.Step2
* Applied comments. Step3
Alexander Alekhin [Sun, 7 Feb 2021 20:07:18 +0000 (20:07 +0000)]
Merge pull request #19422 from alalek:js_tutorial_intelligent_scissors_note
Suleyman TURKMEN [Sun, 7 Feb 2021 02:42:55 +0000 (05:42 +0300)]
Update imageSegmentation.cpp, imageSegmentation.py
Alexander Alekhin [Sat, 6 Feb 2021 14:54:49 +0000 (14:54 +0000)]
Merge pull request #19468 from hmaarrfk:fix_apple_check
Mark Harfouche [Sat, 6 Feb 2021 04:24:56 +0000 (23:24 -0500)]
CHange import order to avoid apple check error
Alexander Alekhin [Sat, 6 Feb 2021 00:43:06 +0000 (00:43 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 6 Feb 2021 00:42:26 +0000 (00:42 +0000)]
Merge pull request #19467 from alalek:hotfix_19411
Alexander Alekhin [Fri, 5 Feb 2021 23:50:42 +0000 (23:50 +0000)]
highgui(pollKey): properly handle no-GUI case
Alexander Alekhin [Fri, 5 Feb 2021 23:46:24 +0000 (23:46 +0000)]
Merge pull request #19466 from alalek:hotfix_19259
Alexander Alekhin [Fri, 5 Feb 2021 22:42:56 +0000 (22:42 +0000)]
core(cuda.hpp): fix GpuMatND compilation with GCC < 5
Polina Smolnikova [Fri, 5 Feb 2021 21:24:27 +0000 (00:24 +0300)]
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>