Jonathan Cole
c4c9cdd2b1
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
2020-11-19 21:20:32 +00:00
chargerKong
11cfa64a10
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
2020-11-19 16:59:33 +00:00
Liubov Batanina
b86f129393
Fixed Test_Model.DetectionOutput
2020-11-19 12:11:52 +03:00
Alexander Alekhin
2687a2b6dc
pre: OpenCV 4.5.1 (version++)
2020-11-18 11:04:54 +00:00
Alexander Alekhin
aab6362705
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
2020-11-18 11:04:15 +00:00
Maxim Pashchenkov
94e8a08d1d
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
2020-11-17 22:57:57 +00:00
Alexander Alekhin
ce8027c6fb
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-17 21:56:26 +00:00
Alexander Alekhin
9485113923
pre: OpenCV 3.4.13 (version++)
2020-11-17 21:50:30 +00:00
Alexander Alekhin
9acbfc6e05
Merge pull request #18711 from alalek:dnn_fix_model_public_api
2020-11-17 21:47:59 +00:00
Alexander Alekhin
4f3130f562
Merge pull request #18145 from sl-sergei:fix_17914
2020-11-17 21:46:08 +00:00
Alexander Alekhin
f7e8dc770a
Merge pull request #18834 from l-bat:update_reducemax
2020-11-17 21:14:10 +00:00
Alexander Alekhin
34909d97b4
Merge pull request #18840 from alalek:dnn_test_skip_myriad_gather_multi_output
2020-11-17 23:45:37 +03:00
Alexander Alekhin
474a67231c
dnn(test): skip gather_multi_output test on Myriad
2020-11-17 19:52:07 +00:00
Omar Alzaibaq
a316b11aaa
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
2020-11-17 19:47:24 +00:00
Alexander Alekhin
b645fc10a3
Merge pull request #18782 from alalek:issue_18779
2020-11-17 19:13:15 +00:00
Orest Chura
2c6a2f0381
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
2020-11-17 15:59:59 +00:00
Dmitry Matveev
b866d0dc38
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
2020-11-17 14:04:19 +00:00
Alexander Alekhin
2b558a3787
core: fix F16C compilation check
2020-11-17 12:22:49 +00:00
Liubov Batanina
72d06080c6
[ONNX] Added Reduce ops for batch and channel
2020-11-17 14:45:36 +03:00
Sergey Slashchinin
3cdf926454
disable Conv1d test on NGRAPH/MYRIAD
2020-11-17 14:33:39 +03:00
Alexander Alekhin
23baf1a75e
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
2020-11-17 11:01:31 +00:00
Alexander Alekhin
025a9647af
Merge pull request #18830 from l-bat:issue_18785
2020-11-17 10:40:53 +00:00
Sergey Slashchinin
32e7ef8a3d
Add fixes and tests for different layers
2020-11-17 13:39:32 +03:00
Sergei Slashchinin
2b82f8f12c
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
2020-11-17 09:52:08 +00:00
Alexander Alekhin
b5c162175b
Merge pull request #18823 from alalek:issue_contrib_2750
2020-11-17 09:47:39 +00:00
Alexander Alekhin
60c76cc289
Merge pull request #18822 from alalek:java_workaround_base_class_issue
2020-11-17 09:47:04 +00:00
Alexander Alekhin
efd556b1a9
Merge pull request #18818 from alalek:objc_skip_nested_classes_namespaces
2020-11-17 09:44:46 +00:00
Liubov Batanina
3a184ae677
[ONNX] Added handler for int32 tensors
2020-11-17 10:17:06 +03:00
Alexander Alekhin
b4b2a276c8
Merge pull request #18756 from andy-held:add_ueye_capture
2020-11-16 22:28:54 +00:00
Alexander Alekhin
464d53bb16
python: emit "string" => "std::string"
2020-11-16 21:34:42 +00:00
Alexander Alekhin
4c9e3723e8
objc: skip unsupported inner namespaces
2020-11-16 19:52:16 +00:00
Maxim Pashchenkov
06477743ab
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
2020-11-16 19:24:55 +00:00
Alexander Alekhin
e4a9ad1730
Merge pull request #18688 from rgarnov:rg/add_gmatdesc_s11n_nd_test
2020-11-16 19:18:38 +00:00
Alexander Alekhin
d0b6637c1d
Merge pull request #18720 from rgarnov:rg/nd_rmat_view
2020-11-16 12:05:08 +00:00
Ruslan Garnov
58268b6eef
Added ND GMatDesc serialization test
2020-11-16 13:03:18 +03:00
Alexander Alekhin
14aa8affe5
Merge pull request #18811 from alalek:objc_headers_import
2020-11-16 09:52:26 +00:00
Alexander Alekhin
56074c2eb3
Merge pull request #18763 from GArik:orbbec
2020-11-16 09:12:25 +00:00
Alexander Alekhin
3da1e8b2f8
Merge pull request #18805 from alalek:cmake_objc_generator
2020-11-16 08:44:14 +00:00
Alexander Alekhin
786cecfe66
Merge pull request #18817 from alalek:fixup_objc_tests
2020-11-16 07:58:48 +00:00
Alexander Alekhin
dde3cb3b99
java: workaround handling of base class
2020-11-16 06:03:30 +00:00
Alexander Alekhin
24f2b7dd3f
objc(test): repair binary resource files
2020-11-16 05:22:45 +00:00
Alexander Alekhin
936530f795
Merge pull request #18808 from alalek:objc_robust_binding_code
2020-11-15 21:36:14 +00:00
Alexander Alekhin
cfbdbffcad
objc: rework headers import
...
- 'AdditionalImports' can be removed from misc/objc/gen_dict.json
- avoid using of legacy 'opencv.hpp'
2020-11-15 05:24:01 +00:00
Alexander Alekhin
71db9d3b57
Merge pull request #18801 from alalek:java_improve_nested_classes_namespaces
2020-11-14 22:55:33 +00:00
Alexander Alekhin
90bea15e35
objc: robust code generation
...
- the same generated code from Python2/3
- avoid randomized output due to unpredictable dict/set order
2020-11-14 22:31:47 +00:00
Alexander Alekhin
9e84b860f2
cmake: update objc generator scripts
...
- allow to run generator without strong requirement of building 'objc' module
2020-11-14 20:59:55 +00:00
Alexander Alekhin
2e7ef6f4e8
objc: fix std::string handling
...
- arg types may be passed as string instead of std::string
2020-11-14 20:01:58 +00:00
Alexander Alekhin
3826158547
java: 'namespace_' class prefix, support inner classes
...
- support multi-level namespaces
- support inner classes (Params)
- reduce scope of 'using namespace' in JNI C++ code
2020-11-13 23:21:03 +00:00
Alexander Alekhin
a7c150ec66
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2020-11-13 22:29:14 +00:00
Sergei Slashchinin
61144f935e
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
2020-11-13 22:22:10 +00:00