Alexander Alekhin [Fri, 27 Nov 2020 14:05:01 +0000 (14:05 +0000)]
Merge pull request #18935 from rgarnov:rg/remove_double_handle_new_stream_call
Alexander Alekhin [Fri, 27 Nov 2020 08:55:49 +0000 (08:55 +0000)]
Merge pull request #18938 from alalek:issue_18865
Alexander Alekhin [Fri, 27 Nov 2020 08:26:45 +0000 (08:26 +0000)]
Merge pull request #18285 from YashasSamaga:cuda4dnn-update-tests
Alexander Alekhin [Thu, 26 Nov 2020 22:56:59 +0000 (01:56 +0300)]
Merge pull request #18924 from alalek:4.x-xcode12
(4.x) build: Xcode 12 support
* build: xcode 12 support, cmake fixes
* ts: eliminate clang 11 warnigns
* 3rdparty: clang 11 warnings
* features2d: eliminate build warnings
* test: warnings
* gapi: warnings from 18928
Alexander Alekhin [Thu, 26 Nov 2020 21:21:05 +0000 (21:21 +0000)]
gapi(test): avoid anonymous namespace types as template parameters
Ruslan Garnov [Thu, 26 Nov 2020 17:00:45 +0000 (20:00 +0300)]
Removed redundant call of handleNewStream in streaming executor
Alexander Alekhin [Thu, 26 Nov 2020 16:03:35 +0000 (16:03 +0000)]
Merge pull request #18929 from alalek:gapi_test_eliminate_rand
Alexander Alekhin [Thu, 26 Nov 2020 08:55:15 +0000 (08:55 +0000)]
gapi: eliminate std::rand() and RAND_MAX from tests
Alexander Alekhin [Wed, 25 Nov 2020 09:25:57 +0000 (09:25 +0000)]
Merge pull request #18907 from diablodale:exec_context_create_addref
Dale Phurrough [Wed, 25 Nov 2020 00:53:41 +0000 (01:53 +0100)]
fix missing addref() in ocl::Context::create(str)
- fix https://github.com/opencv/opencv/issues/18906
- unable to add related test cases as there is
no public access to Context:Impl refcounts
Jonathan Cole [Tue, 24 Nov 2020 21:54:54 +0000 (16:54 -0500)]
Merge pull request #18826 from Rightpoint:feature/colejd/build-catalyst-xcframework
Support XCFramework builds, Catalyst
* Early work on xcframework support
* Improve legibility
* Somehow this works
* Specify ABIs in a place where they won't get erased
If you pass in the C/CXX flags from the Python script, they won't be respected. By doing it in the actual toolchain, the options are respected and Catalyst successfully links.
* Clean up and push updates
* Actually use Catalyst ABI
Needed to specify EXE linker flags to get compiler tests to link to the Catalyst ABIs.
* Clean up
* Revert changes to common toolchain that don't matter
* Try some things
* Support Catalyst build in OSX scripts
* Remove unnecessary iOS reference to AssetsLibrary framework
* Getting closer
* Try some things, port to Python 3
* Some additional fixes
* Point Cmake Plist gen to osx directory for Catalyst targets
* Remove dynamic lib references for Catalyst, copy iOS instead of macos
* Add flag for building only specified archs, remove iOS catalyst refs
* Add build-xcframework.sh
* Update build-xcframework.sh
* Add presumptive Apple Silicon support
* Add arm64 iphonesimulator target
* Fix xcframework build
* Working on arm64 iOS simulator
* Support 2.7 (replace run with check_output)
* Correctly check output of uname_m against arch
* Clean up
* Use lipo for intermediate frameworks, add python script
Remove unneeded __init__.py
* Simplify python xcframework build script
* Add --only-64-bit flag
* Add --framework-name flag
* Document
* Commit to f-strings, improve console output
* Add i386 to iphonesimulator platform in xcframework generator
* Enable objc for non-Catalyst frameworks
* Fix xcframework builder for paths with spaces
* Use arch when specifying Catalyst build platform in build command
* Fix incorrect settings for framework_name argparse configuration
* Prefer underscores instead of hyphens in new flags
* Move Catalyst flags to where they'll actually get used
* Use --without=objc on Catalyst target for now
* Remove get_or_create_folder and simplify logic
* Remove unused import
* Tighten up help text
* Document
* Move common functions into cv_build_utils
* Improve documentation
* Remove old build script
* Add readme
* Check for required CMake and Xcode versions
* Clean up TODOs and re-enable `copy_samples()`
Remove TODO
Fixup
* Add missing print_function import
* Clarify CMake dependency documentation
* Revert python2 change in gen_objc
* Remove unnecessary builtins imports
* Remove trailing whitespace
* Avoid building Catalyst unless specified
This makes Catalyst support a non-breaking change, though defaults should be specified when a breaking change is possible.
* Prevent lipoing for the same archs on different platforms before build
* Rename build-xcframework.py to build_xcframework.py
* Check for duplicate archs more carefully
* Prevent sample copying error when directory already exists
This can happen when building multiple architectures for the same platform.
* Simplify code for checking for default archs
* Improve build_xcframework.py header text
* Correctly resolve Python script paths
* Parse only known args in ios/osx build_framework.py
* Pass through uncaptured args in build_xcframework to osx/ios build
* Fix typo
* Fix typo
* Fix unparameterized build path for intermediate frameworks
* Fix dyanmic info.plist path for catalyst
* Fix utf-8 Python 3 issue
* Add dynamic flag to osx script
* Rename platform to platforms, remove armv7s and i386
* Fix creation of dynamic framework on maccatalyst and macos
* Update platforms/apple/readme.md
* Add `macos_archs` flag and deprecate `archs` flag
* Allow specification of archs when generating xcframework from terminal
* Change xcframework platform argument names to match archs flag names
* Remove platforms as a concept and shadow archs flags from ios/osx .py
* Improve documentation
* Fix building of objc module on Catalyst, excluding Swift
* Clean up build folder logic a bit
* Fix framework_name flag
* Drop passthrough_args, use unknown_args instead
* minor: coding style changes
Co-authored-by: Chris Ballinger <cballinger@rightpoint.com>
Maxim Pashchenkov [Tue, 24 Nov 2020 17:51:02 +0000 (20:51 +0300)]
Merge pull request #18904 from mpashchenkov:mp/ocv-gapi-skip-gm-tests
G-API: Adding skip for GraphMeta tests
* Added skip for GraphMeta tests
* Removed false
Alexander Alekhin [Tue, 24 Nov 2020 11:39:01 +0000 (11:39 +0000)]
Merge pull request #18905 from alalek:objc_fix_return_type_handling
Alexander Alekhin [Mon, 23 Nov 2020 19:05:57 +0000 (19:05 +0000)]
objc: fix handling of std::vector<std::vector<T>> return type
YashasSamaga [Sat, 21 Nov 2020 12:05:20 +0000 (17:35 +0530)]
enable fusion tests, update thresholds and fix missed eltwise fusions
Alexander Alekhin [Fri, 20 Nov 2020 19:35:32 +0000 (19:35 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Nathan Godwin [Fri, 20 Nov 2020 11:25:17 +0000 (05:25 -0600)]
Merge pull request #18371 from nathanrgodwin:sqpnp_dev
Added SQPnP algorithm to SolvePnP
* Added sqpnp
* Fixed test case
* Added fix for duplicate point checking and inverse func reuse
* Changes for 3x speedup
Changed norm method (significant speed increase), changed nearest rotation computation to FOAM
* Added symmetric 3x3 inverse and unrolled loops
* Fixed error with SVD
* Fixed error from with indices
Indices were initialized negative. When nullspace is large, points coplanar, and rotation near 0, indices not changed.
Julien [Fri, 20 Nov 2020 11:14:00 +0000 (12:14 +0100)]
Merge pull request #18841 from JulienMaille:patch-2
Fixing dnn Resize layer for variable input size
* Fix onnx loading of resize/upsample layers for different opset
* group all DynamicResize tests
* cleaned up scales checks
* Simplify branching
Alexander Alekhin [Fri, 20 Nov 2020 11:12:25 +0000 (11:12 +0000)]
Merge pull request #18858 from fegorsch:improve-persistence-doc
Alexander Alekhin [Fri, 20 Nov 2020 08:37:21 +0000 (08:37 +0000)]
Merge pull request #18868 from mpashchenkov:mp/onnx-small-cmake-fix
Felix Gorschlüter [Mon, 9 Nov 2020 13:51:32 +0000 (14:51 +0100)]
Small improvements to persistence-API doc
Jonathan Cole [Thu, 19 Nov 2020 21:20:32 +0000 (16:20 -0500)]
Merge pull request #18855 from Rightpoint:feature/colejd/add-apple-conversions-to-framework-builds
Expose CGImage <-> Mat conversion for iOS platforms
* Add apple_conversions to framework builds
This exposes CGImage <-> Mat conversion.
* Export Mat <-> CGImage methods on iOS targets
* Add CGImage converters to iOS objc helper class
* Add CF_RETURNS_RETAINED annotations to methods returning CGImageRef
Maxim Pashchenkov [Thu, 19 Nov 2020 18:22:19 +0000 (21:22 +0300)]
Added small cmake fix
chargerKong [Thu, 19 Nov 2020 16:59:33 +0000 (00:59 +0800)]
Merge pull request #18335 from chargerKong:master
Ordinary quaternion
* version 1.0
* add assumeUnit;
add UnitTest;
check boundary value;
fix the func using method: func(obj);
fix 4x4;
add rodrigues vector transformation;
fix mat to quat;
* fix blank and tab
* fix blank and tab
modify test;cpp to hpp
* mainly improve comment;
add rvec2Quat;fix toRodrigues;
fix throw to CV_Error
* fix bug of quatd * int;
combine hpp and cpp;
fix << overload error in win system;
modify include in test file;
* move implementation to quaternion.ini.hpp;
change some constructor to createFrom* function;
change Rodrigues vector to rotation vector;
change the matexpr to mat of 3x3 return type;
improve comments;
* try fix log function error in win
* add enums for assumeUnit;
improve docs;
add using std::cos funcs
* remove using std::* from header;
add std::* in affine.hpp,warpers_inl.hpp;
* quat: coding style
* quat: AssumeType => QuatAssumeType
Alexander Alekhin [Thu, 19 Nov 2020 12:00:59 +0000 (12:00 +0000)]
Merge pull request #18854 from GArik:orbbec
Ian Maquignaz [Thu, 19 Nov 2020 11:20:20 +0000 (06:20 -0500)]
Merge pull request #18849 from IanMaquignaz:fix_findFundamentalMat_parameters
Minimum change to address issue #18837
Alexander Alekhin [Thu, 19 Nov 2020 11:18:03 +0000 (11:18 +0000)]
Merge pull request #18848 from IanMaquignaz:fixEpipolarGeometryTutorial
Alexander Alekhin [Thu, 19 Nov 2020 11:01:14 +0000 (11:01 +0000)]
Merge pull request #18863 from l-bat:lb/fix_test
Igor Murzov [Mon, 9 Nov 2020 16:08:09 +0000 (19:08 +0300)]
Add tutorial on how to use Orbbec Astra 3D cameras
Liubov Batanina [Thu, 19 Nov 2020 09:11:52 +0000 (12:11 +0300)]
Fixed Test_Model.DetectionOutput
Ian Maquignaz [Wed, 18 Nov 2020 04:13:57 +0000 (23:13 -0500)]
Fixed issue with Epipolar Geometry Tutorial
Alexander Alekhin [Wed, 18 Nov 2020 16:50:35 +0000 (16:50 +0000)]
Merge pull request #18675 from sturkmen72:update-documentation
Alexander Alekhin [Wed, 18 Nov 2020 16:48:36 +0000 (16:48 +0000)]
Merge pull request #17839 from malliaridis:master
Suleyman TURKMEN [Wed, 28 Oct 2020 01:51:12 +0000 (04:51 +0300)]
update documentation
Christos Malliaridis [Tue, 14 Jul 2020 16:44:12 +0000 (18:44 +0200)]
Update and expand erosion / dilation tutorial
- Add python explanation for erosion and dilation
- Add java explanation for erosion and dilation
- Restructure and reword specific sections
Alexander Alekhin [Wed, 18 Nov 2020 11:20:22 +0000 (14:20 +0300)]
Merge pull request #18825 from alalek:update_version_4.5.1-pre
Alexander Alekhin [Mon, 16 Nov 2020 22:31:15 +0000 (22:31 +0000)]
pre: OpenCV 4.5.1 (version++)
Alexander Alekhin [Wed, 18 Nov 2020 11:04:15 +0000 (14:04 +0300)]
Merge pull request #18838 from alalek:video_tracking_api
Tracking API: move to video/tracking.hpp
* video(tracking): moved code from opencv_contrib/tracking module
- Tracker API
- MIL, GOTURN trackers
- applied clang-format
* video(tracking): cleanup unused code
* samples: add tracker.py sample
* video(tracking): avoid div by zero
* static analyzer
Maxim Pashchenkov [Tue, 17 Nov 2020 22:57:57 +0000 (01:57 +0300)]
Merge pull request #18819 from mpashchenkov:mp/ocv-gapi-skip-centos-tests
G-API: Adding a skip for failed streaming tests
* Skip tests
* Pathfinding
* Pathfinding part 2
* Pathfinding part 3
* Fix review comments
Alexander Alekhin [Tue, 17 Nov 2020 21:56:26 +0000 (21:56 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 17 Nov 2020 21:51:21 +0000 (00:51 +0300)]
Merge pull request #18824 from alalek:update_version_3.4.13-pre
Alexander Alekhin [Mon, 16 Nov 2020 22:10:23 +0000 (22:10 +0000)]
pre: OpenCV 3.4.13 (version++)
Alexander Alekhin [Tue, 17 Nov 2020 21:47:59 +0000 (21:47 +0000)]
Merge pull request #18711 from alalek:dnn_fix_model_public_api
Alexander Alekhin [Tue, 17 Nov 2020 21:46:07 +0000 (21:46 +0000)]
Merge pull request #18145 from sl-sergei:fix_17914
Alexander Alekhin [Tue, 17 Nov 2020 21:14:55 +0000 (00:14 +0300)]
Merge pull request #18839 from alalek:update_libjpeg-turbo
3rdparty: libjpeg-turbo 2.0.5 => 2.0.6
Alexander Alekhin [Tue, 17 Nov 2020 21:14:10 +0000 (21:14 +0000)]
Merge pull request #18834 from l-bat:update_reducemax
Alexander Alekhin [Tue, 17 Nov 2020 20:45:37 +0000 (23:45 +0300)]
Merge pull request #18840 from alalek:dnn_test_skip_myriad_gather_multi_output
Alexander Alekhin [Tue, 17 Nov 2020 19:52:07 +0000 (19:52 +0000)]
dnn(test): skip gather_multi_output test on Myriad
Omar Alzaibaq [Tue, 17 Nov 2020 19:47:24 +0000 (21:47 +0200)]
Merge pull request #18220 from Omar-AE:hddl-supported
* added HDDL VPU support
* changed to return True in one line if any device connected
* dnn: use releaseHDDLPlugin()
* dnn(hddl): fix conditions
Alexander Alekhin [Tue, 17 Nov 2020 19:13:15 +0000 (19:13 +0000)]
Merge pull request #18782 from alalek:issue_18779
Alexander Alekhin [Tue, 17 Nov 2020 19:11:38 +0000 (19:11 +0000)]
Merge pull request #18833 from sl-sergei:disable_conv1d_wb_test
Alexander Alekhin [Tue, 17 Nov 2020 18:16:34 +0000 (18:16 +0000)]
3rdparty: libjpeg-turbo 2.0.5 => 2.0.6
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.6
Alexander Alekhin [Tue, 17 Nov 2020 17:13:43 +0000 (17:13 +0000)]
Merge pull request #18828 from ichisadashioko:fix-calibration-sample-typo
Orest Chura [Tue, 17 Nov 2020 15:59:59 +0000 (18:59 +0300)]
Merge pull request #18790 from OrestChura:oc/fitLine
[G-API]: fitLine() Standard Kernel Implementation
* fitLine API (Mat, 32S, 32F) (2D, 3D)
* Complete fitLine kernel & accuracy tests
- initialization for vectors of cv::Point and Mats via vectors added
- comparison functions for Vec<T, n> added:
- straight average difference comparison
- comparison by equasion for 2d line
- stream overload for cv::DistanceTypes added
* Fix precommit warnings
* Fix docs
* Address comments
Try to fix warning
* Disable warning in tests
shioko [Tue, 17 Nov 2020 15:02:55 +0000 (15:02 +0000)]
Fix typo 'Applicatioin'
Dmitry Matveev [Tue, 17 Nov 2020 14:04:19 +0000 (17:04 +0300)]
Merge pull request #18793 from dmatveev:dm/in_graph_metadata
G-API: Introduce runtime in-graph metadata
* G-API: In-graph metadata -- initial implementation
* G-API: Finish the in-graph metadata implementation for Streaming
* G-API: Fix standalone build & warnings for in-graph metadata
* G-API: In-graph meta -- fixed review comments
* G-API: Fix issues with desync causing failing tests
Alexander Alekhin [Wed, 11 Nov 2020 17:57:53 +0000 (17:57 +0000)]
core: fix F16C compilation check
Liubov Batanina [Tue, 17 Nov 2020 11:45:36 +0000 (14:45 +0300)]
[ONNX] Added Reduce ops for batch and channel
Sergey Slashchinin [Tue, 17 Nov 2020 11:33:39 +0000 (14:33 +0300)]
disable Conv1d test on NGRAPH/MYRIAD
Alexander Alekhin [Sat, 31 Oct 2020 14:08:13 +0000 (14:08 +0000)]
dnn: fix High-Level public API (cv::dnn::Model class)
- proxy selected Net methods only (don't derive from Net directly)
- default Model ctor is protected
Alexander Alekhin [Tue, 17 Nov 2020 10:40:53 +0000 (10:40 +0000)]
Merge pull request #18830 from l-bat:issue_18785
Sergey Slashchinin [Tue, 17 Nov 2020 10:31:04 +0000 (13:31 +0300)]
Add fixes and tests for different layers
Sergei Slashchinin [Tue, 17 Nov 2020 09:52:08 +0000 (12:52 +0300)]
Merge pull request #18296 from sl-sergei:fix_16783
Fix loading issue for Faster RCNN model from #16783
* Add a reproducer with multi-output Gather
* Fix an issue with ONNX graph simplifier
* fix build
* Move checks to correct class
* Minor changes for better code appearence
Alexander Alekhin [Tue, 17 Nov 2020 09:47:39 +0000 (09:47 +0000)]
Merge pull request #18823 from alalek:issue_contrib_2750
Alexander Alekhin [Tue, 17 Nov 2020 09:47:04 +0000 (09:47 +0000)]
Merge pull request #18822 from alalek:java_workaround_base_class_issue
Alexander Alekhin [Tue, 17 Nov 2020 09:44:45 +0000 (09:44 +0000)]
Merge pull request #18818 from alalek:objc_skip_nested_classes_namespaces
Liubov Batanina [Tue, 17 Nov 2020 07:14:41 +0000 (10:14 +0300)]
[ONNX] Added handler for int32 tensors
Alexander Alekhin [Mon, 16 Nov 2020 22:28:54 +0000 (22:28 +0000)]
Merge pull request #18756 from andy-held:add_ueye_capture
Alexander Alekhin [Mon, 16 Nov 2020 21:34:42 +0000 (21:34 +0000)]
python: emit "string" => "std::string"
Alexander Alekhin [Sun, 15 Nov 2020 19:22:05 +0000 (19:22 +0000)]
objc: skip unsupported inner namespaces
Maxim Pashchenkov [Mon, 16 Nov 2020 19:24:55 +0000 (22:24 +0300)]
Merge pull request #18744 from mpashchenkov:mp/onnx-dynamic-input-tensor
G-API: ONNX. Support tensor input for CNN with dynamic input
* Added support for dynamic input tensor, refactored one input/output tests
* Added multiple input/output fixture, test for mobilenet
* Removed whitespace
* Removed mistake in inferROI
* Small fixes
* One more fix
* Code cleanup
* Code cleanup X2
* bb rstrt
* Fix review comments
* One more fix review comments
* Mistake
Alexander Alekhin [Mon, 16 Nov 2020 19:18:38 +0000 (19:18 +0000)]
Merge pull request #18688 from rgarnov:rg/add_gmatdesc_s11n_nd_test
Alexander Alekhin [Mon, 16 Nov 2020 12:05:08 +0000 (12:05 +0000)]
Merge pull request #18720 from rgarnov:rg/nd_rmat_view
Ruslan Garnov [Wed, 28 Oct 2020 18:52:53 +0000 (21:52 +0300)]
Added ND GMatDesc serialization test
Alexander Alekhin [Mon, 16 Nov 2020 09:52:26 +0000 (09:52 +0000)]
Merge pull request #18811 from alalek:objc_headers_import
Alexander Alekhin [Mon, 16 Nov 2020 09:12:25 +0000 (09:12 +0000)]
Merge pull request #18763 from GArik:orbbec
Alexander Alekhin [Mon, 16 Nov 2020 08:44:14 +0000 (08:44 +0000)]
Merge pull request #18805 from alalek:cmake_objc_generator
Alexander Alekhin [Mon, 16 Nov 2020 07:58:48 +0000 (07:58 +0000)]
Merge pull request #18817 from alalek:fixup_objc_tests
Alexander Alekhin [Mon, 16 Nov 2020 04:30:45 +0000 (04:30 +0000)]
java: workaround handling of base class
Alexander Alekhin [Mon, 16 Nov 2020 05:22:45 +0000 (05:22 +0000)]
objc(test): repair binary resource files
Alexander Alekhin [Sun, 15 Nov 2020 21:36:14 +0000 (21:36 +0000)]
Merge pull request #18808 from alalek:objc_robust_binding_code
Alexander Alekhin [Sat, 14 Nov 2020 22:04:57 +0000 (22:04 +0000)]
objc: rework headers import
- 'AdditionalImports' can be removed from misc/objc/gen_dict.json
- avoid using of legacy 'opencv.hpp'
Alexander Alekhin [Sat, 14 Nov 2020 22:55:33 +0000 (22:55 +0000)]
Merge pull request #18801 from alalek:java_improve_nested_classes_namespaces
Alexander Alekhin [Sat, 14 Nov 2020 22:48:49 +0000 (22:48 +0000)]
Merge pull request #18810 from AntonVeselskyi:bugfix-18807
Alexander Alekhin [Sat, 14 Nov 2020 22:46:48 +0000 (22:46 +0000)]
Merge pull request #18802 from aitikgupta:typo
Alexander Alekhin [Sat, 14 Nov 2020 19:05:10 +0000 (19:05 +0000)]
objc: robust code generation
- the same generated code from Python2/3
- avoid randomized output due to unpredictable dict/set order
Alexander Alekhin [Sat, 14 Nov 2020 22:13:27 +0000 (22:13 +0000)]
Merge pull request #18809 from alalek:objc_string
Anton Veselskyi [Sat, 14 Nov 2020 21:29:51 +0000 (23:29 +0200)]
Changed sample code, fixes #18807
Alexander Alekhin [Sat, 14 Nov 2020 07:16:13 +0000 (07:16 +0000)]
cmake: update objc generator scripts
- allow to run generator without strong requirement of building 'objc' module
Alexander Alekhin [Sat, 14 Nov 2020 19:10:43 +0000 (19:10 +0000)]
objc: fix std::string handling
- arg types may be passed as string instead of std::string
Alexander Alekhin [Sat, 14 Nov 2020 18:17:31 +0000 (18:17 +0000)]
Merge pull request #18806 from quaresmajose:cmake
Jose Quaresma [Sun, 1 Nov 2020 12:29:56 +0000 (12:29 +0000)]
samples: cmake: digits needs opencv_dnn module to build
Intrudeced in commit
397ba2d9aafb5312e777ce2f886d7b568109e931:
add OpenCV sample for digit and text recongnition, and provide multiple OCR models.
https://github.com/opencv/opencv/commit/
397ba2d9aafb5312e777ce2f886d7b568109e931
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Aitik Gupta [Sat, 14 Nov 2020 02:47:44 +0000 (08:17 +0530)]
Small typo-fix
Alexander Alekhin [Fri, 13 Nov 2020 06:27:18 +0000 (06:27 +0000)]
java: 'namespace_' class prefix, support inner classes
- support multi-level namespaces
- support inner classes (Params)
- reduce scope of 'using namespace' in JNI C++ code
Alexander Alekhin [Fri, 13 Nov 2020 22:29:14 +0000 (22:29 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Sergei Slashchinin [Fri, 13 Nov 2020 22:22:10 +0000 (01:22 +0300)]
Merge pull request #18783 from sl-sergei:fix_conv1d
Add support for Conv1D on OpenCV backend
* Add support for Conv1D on OpenCV backend
* disable tests on other targets/backends
* Fix formatting
* Restore comment
* Remove unnecessary flag and fix test logic
* Fix perf test
* fix braces
* Fix indentation, assert check and remove unnecessary condition
* Remove unnecessary changes
* Add test cases for variable weights and bias
* dnn(conv): fallback on OpenCV+CPU instead of failures
* coding style
Alexander Alekhin [Fri, 13 Nov 2020 21:26:23 +0000 (21:26 +0000)]
Merge pull request #18798 from alalek:java_robust_binding_code
Alexander Alekhin [Fri, 13 Nov 2020 21:07:29 +0000 (21:07 +0000)]
Merge pull request #18499 from RidgeRun:optional-gstreamer-mainloop
Andreas Franek [Sun, 18 Oct 2020 09:48:41 +0000 (11:48 +0200)]
add rudimentary support for uEye cameras
uEye are cameras from IDS, c.f. https://en.ids-imaging.com/
Supports driver version 4.94 and up currently, since the event system was overhauled there.
Supports setting/getting the properties: fps,width,height
Chris Ballinger [Fri, 13 Nov 2020 15:30:53 +0000 (07:30 -0800)]
Merge pull request #18771 from chrisballinger:xcode-12-fixes
Xcode 12 and Python 2/3 fixes
* Fix compilation issues using Xcode 12 on macOS Catalina
* Fix macOS scripts to work on Python 2 or 3
* Fix additional issues with Python 3
* Fix additional Python 2/3 issue
* Fix another Python 2/3 issue
* Remove dependency on builtins module