platform/upstream/opencv.git
3 years agoMerge pull request #18863 from l-bat:lb/fix_test
Alexander Alekhin [Thu, 19 Nov 2020 11:01:14 +0000 (11:01 +0000)]
Merge pull request #18863 from l-bat:lb/fix_test

3 years agoFixed Test_Model.DetectionOutput
Liubov Batanina [Thu, 19 Nov 2020 09:11:52 +0000 (12:11 +0300)]
Fixed Test_Model.DetectionOutput

3 years agoMerge pull request #18825 from alalek:update_version_4.5.1-pre
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

3 years agopre: OpenCV 4.5.1 (version++)
Alexander Alekhin [Mon, 16 Nov 2020 22:31:15 +0000 (22:31 +0000)]
pre: OpenCV 4.5.1 (version++)

3 years agoMerge pull request #18838 from alalek:video_tracking_api
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

3 years agoMerge pull request #18819 from mpashchenkov:mp/ocv-gapi-skip-centos-tests
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

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 17 Nov 2020 21:56:26 +0000 (21:56 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #18824 from alalek:update_version_3.4.13-pre
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

3 years agopre: OpenCV 3.4.13 (version++)
Alexander Alekhin [Mon, 16 Nov 2020 22:10:23 +0000 (22:10 +0000)]
pre: OpenCV 3.4.13 (version++)

3 years agoMerge pull request #18711 from alalek:dnn_fix_model_public_api
Alexander Alekhin [Tue, 17 Nov 2020 21:47:59 +0000 (21:47 +0000)]
Merge pull request #18711 from alalek:dnn_fix_model_public_api

3 years agoMerge pull request #18145 from sl-sergei:fix_17914
Alexander Alekhin [Tue, 17 Nov 2020 21:46:07 +0000 (21:46 +0000)]
Merge pull request #18145 from sl-sergei:fix_17914

3 years agoMerge pull request #18839 from alalek:update_libjpeg-turbo
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

3 years agoMerge pull request #18834 from l-bat:update_reducemax
Alexander Alekhin [Tue, 17 Nov 2020 21:14:10 +0000 (21:14 +0000)]
Merge pull request #18834 from l-bat:update_reducemax

3 years agoMerge pull request #18840 from alalek:dnn_test_skip_myriad_gather_multi_output
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

3 years agodnn(test): skip gather_multi_output test on Myriad
Alexander Alekhin [Tue, 17 Nov 2020 19:52:07 +0000 (19:52 +0000)]
dnn(test): skip gather_multi_output test on Myriad

3 years agoMerge pull request #18220 from Omar-AE:hddl-supported
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

3 years agoMerge pull request #18782 from alalek:issue_18779
Alexander Alekhin [Tue, 17 Nov 2020 19:13:15 +0000 (19:13 +0000)]
Merge pull request #18782 from alalek:issue_18779

3 years agoMerge pull request #18833 from sl-sergei:disable_conv1d_wb_test
Alexander Alekhin [Tue, 17 Nov 2020 19:11:38 +0000 (19:11 +0000)]
Merge pull request #18833 from sl-sergei:disable_conv1d_wb_test

3 years ago3rdparty: libjpeg-turbo 2.0.5 => 2.0.6
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

3 years agoMerge pull request #18828 from ichisadashioko:fix-calibration-sample-typo
Alexander Alekhin [Tue, 17 Nov 2020 17:13:43 +0000 (17:13 +0000)]
Merge pull request #18828 from ichisadashioko:fix-calibration-sample-typo

3 years agoMerge pull request #18790 from OrestChura:oc/fitLine
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

3 years agoFix typo 'Applicatioin'
shioko [Tue, 17 Nov 2020 15:02:55 +0000 (15:02 +0000)]
Fix typo 'Applicatioin'

3 years agoMerge pull request #18793 from dmatveev:dm/in_graph_metadata
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

3 years agocore: fix F16C compilation check
Alexander Alekhin [Wed, 11 Nov 2020 17:57:53 +0000 (17:57 +0000)]
core: fix F16C compilation check

3 years ago[ONNX] Added Reduce ops for batch and channel
Liubov Batanina [Tue, 17 Nov 2020 11:45:36 +0000 (14:45 +0300)]
[ONNX] Added Reduce ops for batch and channel

3 years agodisable Conv1d test on NGRAPH/MYRIAD
Sergey Slashchinin [Tue, 17 Nov 2020 11:33:39 +0000 (14:33 +0300)]
disable Conv1d test on NGRAPH/MYRIAD

3 years agodnn: fix High-Level public API (cv::dnn::Model class)
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

3 years agoMerge pull request #18830 from l-bat:issue_18785
Alexander Alekhin [Tue, 17 Nov 2020 10:40:53 +0000 (10:40 +0000)]
Merge pull request #18830 from l-bat:issue_18785

3 years agoAdd fixes and tests for different layers
Sergey Slashchinin [Tue, 17 Nov 2020 10:31:04 +0000 (13:31 +0300)]
Add fixes and tests for different layers

3 years agoMerge pull request #18296 from sl-sergei:fix_16783
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

3 years agoMerge pull request #18823 from alalek:issue_contrib_2750
Alexander Alekhin [Tue, 17 Nov 2020 09:47:39 +0000 (09:47 +0000)]
Merge pull request #18823 from alalek:issue_contrib_2750

3 years agoMerge pull request #18822 from alalek:java_workaround_base_class_issue
Alexander Alekhin [Tue, 17 Nov 2020 09:47:04 +0000 (09:47 +0000)]
Merge pull request #18822 from alalek:java_workaround_base_class_issue

3 years agoMerge pull request #18818 from alalek:objc_skip_nested_classes_namespaces
Alexander Alekhin [Tue, 17 Nov 2020 09:44:45 +0000 (09:44 +0000)]
Merge pull request #18818 from alalek:objc_skip_nested_classes_namespaces

3 years ago[ONNX] Added handler for int32 tensors
Liubov Batanina [Tue, 17 Nov 2020 07:14:41 +0000 (10:14 +0300)]
[ONNX] Added handler for int32 tensors

3 years agoMerge pull request #18756 from andy-held:add_ueye_capture
Alexander Alekhin [Mon, 16 Nov 2020 22:28:54 +0000 (22:28 +0000)]
Merge pull request #18756 from andy-held:add_ueye_capture

3 years agopython: emit "string" => "std::string"
Alexander Alekhin [Mon, 16 Nov 2020 21:34:42 +0000 (21:34 +0000)]
python: emit "string" => "std::string"

3 years agoobjc: skip unsupported inner namespaces
Alexander Alekhin [Sun, 15 Nov 2020 19:22:05 +0000 (19:22 +0000)]
objc: skip unsupported inner namespaces

3 years agoMerge pull request #18744 from mpashchenkov:mp/onnx-dynamic-input-tensor
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

3 years agoMerge pull request #18688 from rgarnov:rg/add_gmatdesc_s11n_nd_test
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

3 years agoMerge pull request #18720 from rgarnov:rg/nd_rmat_view
Alexander Alekhin [Mon, 16 Nov 2020 12:05:08 +0000 (12:05 +0000)]
Merge pull request #18720 from rgarnov:rg/nd_rmat_view

3 years agoAdded ND GMatDesc serialization test
Ruslan Garnov [Wed, 28 Oct 2020 18:52:53 +0000 (21:52 +0300)]
Added ND GMatDesc serialization test

3 years agoMerge pull request #18811 from alalek:objc_headers_import
Alexander Alekhin [Mon, 16 Nov 2020 09:52:26 +0000 (09:52 +0000)]
Merge pull request #18811 from alalek:objc_headers_import

3 years agoMerge pull request #18763 from GArik:orbbec
Alexander Alekhin [Mon, 16 Nov 2020 09:12:25 +0000 (09:12 +0000)]
Merge pull request #18763 from GArik:orbbec

3 years agoMerge pull request #18805 from alalek:cmake_objc_generator
Alexander Alekhin [Mon, 16 Nov 2020 08:44:14 +0000 (08:44 +0000)]
Merge pull request #18805 from alalek:cmake_objc_generator

3 years agoMerge pull request #18817 from alalek:fixup_objc_tests
Alexander Alekhin [Mon, 16 Nov 2020 07:58:48 +0000 (07:58 +0000)]
Merge pull request #18817 from alalek:fixup_objc_tests

3 years agojava: workaround handling of base class
Alexander Alekhin [Mon, 16 Nov 2020 04:30:45 +0000 (04:30 +0000)]
java: workaround handling of base class

3 years agoobjc(test): repair binary resource files
Alexander Alekhin [Mon, 16 Nov 2020 05:22:45 +0000 (05:22 +0000)]
objc(test): repair binary resource files

3 years agoMerge pull request #18808 from alalek:objc_robust_binding_code
Alexander Alekhin [Sun, 15 Nov 2020 21:36:14 +0000 (21:36 +0000)]
Merge pull request #18808 from alalek:objc_robust_binding_code

3 years agoobjc: rework headers import
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'

3 years agoMerge pull request #18801 from alalek:java_improve_nested_classes_namespaces
Alexander Alekhin [Sat, 14 Nov 2020 22:55:33 +0000 (22:55 +0000)]
Merge pull request #18801 from alalek:java_improve_nested_classes_namespaces

3 years agoMerge pull request #18810 from AntonVeselskyi:bugfix-18807
Alexander Alekhin [Sat, 14 Nov 2020 22:48:49 +0000 (22:48 +0000)]
Merge pull request #18810 from AntonVeselskyi:bugfix-18807

3 years agoMerge pull request #18802 from aitikgupta:typo
Alexander Alekhin [Sat, 14 Nov 2020 22:46:48 +0000 (22:46 +0000)]
Merge pull request #18802 from aitikgupta:typo

3 years agoobjc: robust code generation
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

3 years agoMerge pull request #18809 from alalek:objc_string
Alexander Alekhin [Sat, 14 Nov 2020 22:13:27 +0000 (22:13 +0000)]
Merge pull request #18809 from alalek:objc_string

3 years agoChanged sample code, fixes #18807
Anton Veselskyi [Sat, 14 Nov 2020 21:29:51 +0000 (23:29 +0200)]
Changed sample code,  fixes #18807

3 years agocmake: update objc generator scripts
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

3 years agoobjc: fix std::string handling
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

3 years agoMerge pull request #18806 from quaresmajose:cmake
Alexander Alekhin [Sat, 14 Nov 2020 18:17:31 +0000 (18:17 +0000)]
Merge pull request #18806 from quaresmajose:cmake

3 years agosamples: cmake: digits needs opencv_dnn module to build
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>
3 years agoSmall typo-fix
Aitik Gupta [Sat, 14 Nov 2020 02:47:44 +0000 (08:17 +0530)]
Small typo-fix

3 years agojava: 'namespace_' class prefix, support inner classes
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

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 13 Nov 2020 22:29:14 +0000 (22:29 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #18783 from sl-sergei:fix_conv1d
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

3 years agoMerge pull request #18798 from alalek:java_robust_binding_code
Alexander Alekhin [Fri, 13 Nov 2020 21:26:23 +0000 (21:26 +0000)]
Merge pull request #18798 from alalek:java_robust_binding_code

3 years agoMerge pull request #18499 from RidgeRun:optional-gstreamer-mainloop
Alexander Alekhin [Fri, 13 Nov 2020 21:07:29 +0000 (21:07 +0000)]
Merge pull request #18499 from RidgeRun:optional-gstreamer-mainloop

3 years agoadd rudimentary support for uEye cameras
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

3 years agoMerge pull request #18771 from chrisballinger:xcode-12-fixes
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

3 years agoMerge pull request #18729 from rgarnov:rg/extend_parse_yolo
Alexander Alekhin [Fri, 13 Nov 2020 15:18:55 +0000 (15:18 +0000)]
Merge pull request #18729 from rgarnov:rg/extend_parse_yolo

3 years agojava: robust code generation
Alexander Alekhin [Thu, 12 Nov 2020 19:47:54 +0000 (19:47 +0000)]
java: robust code generation

- the same generated code from Python2/3
- avoid randomized output due to unpredictable dict/set order

3 years agoAdded support of 1x1x1xN input for parseYolo
Ruslan Garnov [Wed, 4 Nov 2020 23:27:32 +0000 (02:27 +0300)]
Added support of 1x1x1xN input for parseYolo

3 years agovideoio: Support Orbbec Astra 3D cameras using OpenNI2 API
Igor Murzov [Mon, 9 Nov 2020 16:03:46 +0000 (19:03 +0300)]
videoio: Support Orbbec Astra 3D cameras using OpenNI2 API

Only depth sensor is supported. Color sensor is accessible as a
regular UVC camera.

3 years agoMerge pull request #18795 from aitikgupta:stiching-bug
Alexander Alekhin [Fri, 13 Nov 2020 11:20:36 +0000 (11:20 +0000)]
Merge pull request #18795 from aitikgupta:stiching-bug

3 years agoUse in-place sort
Aitik Gupta [Fri, 13 Nov 2020 03:30:54 +0000 (09:00 +0530)]
Use in-place sort

3 years agoMerge pull request #18786 from mshabunin:fix-kw-2
Alexander Alekhin [Thu, 12 Nov 2020 15:41:18 +0000 (15:41 +0000)]
Merge pull request #18786 from mshabunin:fix-kw-2

3 years agoMerge pull request #18774 from alalek:bindings_namespace_inline
Alexander Alekhin [Thu, 12 Nov 2020 12:23:37 +0000 (12:23 +0000)]
Merge pull request #18774 from alalek:bindings_namespace_inline

3 years agocalib3d: uninitialzed fields in usac
Maksim Shabunin [Thu, 12 Nov 2020 10:38:26 +0000 (13:38 +0300)]
calib3d: uninitialzed fields in usac

3 years agoAdded multidimensional RMat::View steps
Ruslan Garnov [Tue, 3 Nov 2020 15:50:49 +0000 (18:50 +0300)]
Added multidimensional RMat::View steps

3 years agoMerge pull request #18770 from mshabunin:fix-kw-1
Alexander Alekhin [Wed, 11 Nov 2020 16:14:14 +0000 (16:14 +0000)]
Merge pull request #18770 from mshabunin:fix-kw-1

3 years agoMerge pull request #18510 from OrestChura:oc/boundingRect
Orest Chura [Wed, 11 Nov 2020 12:13:10 +0000 (15:13 +0300)]
Merge pull request #18510 from OrestChura:oc/boundingRect

[G-API]: findContours() and boundingRect() Standard Kernels Implementation

* Add findContours() standard kernel
 - API and documentation provided:
   - as OpenCV provides two overloads whether to calculate hierarchy or not, but they differ by only the output in sight of G-API, two different G-API functions and kernels implemented
   - G-API Imgproc documentation divided into more parts according to imgproc module parts
   - some typos connected with division into parts corrected
 - `GArray<GArray<U>>` overload for `get_out` function provided to coonvert correctly into `vector<vector<U>>`
 - OCV backend supported
 - accuracy tests provided

* Add boundingRect() standard kernel
     - API and documentation provided:
       - GOpaque<Rect> used as an output
       - as OpenCV provides two possibilities whether to take a gray-scale image or a set of 2D points (`Point2i` or `Point2f` supported), three different overloads of a single G-API function and three kernels implemented
          - for a gray-scale image the overload via `GMat`
          - for a set of `Point2i` - the one via GArray<`Point2i`>
          - set of `Point2f` -> GArray<`Point2f`>
     - OCV backend supported
     - accuracy tests provided
       - comparison function for Rects provided
     - some typos in `gapi_tests_common` corrected

* Fix precommit windows warnings

* - Addressing comments:
   - split tests
 - Fix Windows warnings

* Static_cast for warnings

* - Remove randomness
 - Fix unnecessary precision losses

* - Forgot reference for RNG

* addressing comments

* equalizeHist -> no group

* `const` addedin new functions

* Address suggestions:
 - Hierarchical -> H
 - added cv::GMatDesc::isVectorPoins()
 - added support of giving a set of points to boundingRect()

* Addressing comments
 - IoU comparison function added for Rects
 - isPointsVector moved from a GMatDesc method to a separate function in imgproc.hpp
 - enums instead of int
 - typos corrected

* Addressing comments
 - findContours: Point offset -> GOpaque<Point>
 - removed "straight" comparison for Rects, IoU available only
 - changed vectors initialization -> fix Debug test run
 - Some typos

* added comment for later upgrades

* Fix not to corrupt docs by FIXME

* Addressing commens
 - overload without offset added (as a temporary workaround)
 - checkMetaForFindingContours -> validateFindingContoursMeta
 - added ostream overload for enums used in tests

3 years agoFix issues found by static analysis
Maksim Shabunin [Tue, 10 Nov 2020 22:54:01 +0000 (01:54 +0300)]
Fix issues found by static analysis

3 years agobindings: "inline namespace"
Alexander Alekhin [Sat, 7 Nov 2020 18:25:48 +0000 (18:25 +0000)]
bindings: "inline namespace"

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 10 Nov 2020 20:09:18 +0000 (20:09 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #18765 from GArik:tutorials
Alexander Alekhin [Tue, 10 Nov 2020 20:08:29 +0000 (20:08 +0000)]
Merge pull request #18765 from GArik:tutorials

3 years agoMerge pull request #18652 from OrestChura:oc/morphologyEx
Orest Chura [Tue, 10 Nov 2020 18:57:52 +0000 (21:57 +0300)]
Merge pull request #18652 from OrestChura:oc/morphologyEx

[G-API]: morphologyEx() Standard Kernel Implementation

* cv::gapi::morphologyEx() kernel
 - implemented (without separate 3x3 version)
 - tests added: check only different operations, not kernels/borders

* Address comments: add `const` where needed

* Replaced fundamental tyeps -> enums where needed
 - added operator<< overload for cv::MorphTypes for tests output

3 years agoMerge pull request #18764 from alalek:doxygen_image_path
Alexander Alekhin [Tue, 10 Nov 2020 18:55:10 +0000 (18:55 +0000)]
Merge pull request #18764 from alalek:doxygen_image_path

3 years agoFix code snippets inclusion into video tutorials
Igor Murzov [Tue, 10 Nov 2020 12:36:13 +0000 (15:36 +0300)]
Fix code snippets inclusion into video tutorials

Code snippets need a section marked with ### above to render properly

3 years agodoxygen: adjust IMAGE_PATH, allow custom OPENCV_DOCS_EXTRA_IMAGE_PATH
Alexander Alekhin [Mon, 9 Nov 2020 19:12:09 +0000 (19:12 +0000)]
doxygen: adjust IMAGE_PATH, allow custom OPENCV_DOCS_EXTRA_IMAGE_PATH

- add opencv/modules
- add opencv_contrib/modules

3 years agoMerge pull request #18752 from alalek:dnn_defines_openvino_2021.1.0
Alexander Alekhin [Sun, 8 Nov 2020 18:09:52 +0000 (18:09 +0000)]
Merge pull request #18752 from alalek:dnn_defines_openvino_2021.1.0

3 years agoMerge pull request #18753 from catree:fix_FindOpenBLAS_typo
Alexander Alekhin [Sun, 8 Nov 2020 18:09:26 +0000 (18:09 +0000)]
Merge pull request #18753 from catree:fix_FindOpenBLAS_typo

3 years agoFix typo in OpenCVFindOpenBLAS.cmake file.
catree [Sun, 8 Nov 2020 13:42:47 +0000 (14:42 +0100)]
Fix typo in OpenCVFindOpenBLAS.cmake file.

3 years agodnn: use OpenVINO 2021.1 defines
Alexander Alekhin [Sat, 7 Nov 2020 17:27:33 +0000 (17:27 +0000)]
dnn: use OpenVINO 2021.1 defines

3 years agoMerge pull request #18746 from alalek:backport_18741
Alexander Alekhin [Sat, 7 Nov 2020 15:47:15 +0000 (15:47 +0000)]
Merge pull request #18746 from alalek:backport_18741

3 years agoUse explicit opset of Unsqueeze from nGraph
Roman Kazantsev [Fri, 6 Nov 2020 06:51:40 +0000 (09:51 +0300)]
Use explicit opset of Unsqueeze from nGraph

backporting commit eb24575e2ce6ae56613fe4b9709ea55b4d8a228e

3 years agoMerge pull request #18742 from AsyaPronina:asyadev/fix_preprocessing_for_import_network
Alexander Alekhin [Fri, 6 Nov 2020 16:39:03 +0000 (16:39 +0000)]
Merge pull request #18742 from AsyaPronina:asyadev/fix_preprocessing_for_import_network

3 years agoMerge pull request #18732 from junxnone:master
Alexander Alekhin [Fri, 6 Nov 2020 16:36:58 +0000 (16:36 +0000)]
Merge pull request #18732 from junxnone:master

3 years agoMerge pull request #18741 from rkazants:fix/rkazants/39665_unsqueeze
Alexander Alekhin [Fri, 6 Nov 2020 13:26:24 +0000 (13:26 +0000)]
Merge pull request #18741 from rkazants:fix/rkazants/39665_unsqueeze

3 years agoFixed Inputs/OutputsDataMap conversion
Anastasiya Pronina [Fri, 6 Nov 2020 11:54:23 +0000 (14:54 +0300)]
Fixed Inputs/OutputsDataMap conversion

3 years agoMerge pull request #18740 from rgarnov:rg/fix_rmat_media_missing_in_standalone
Alexander Alekhin [Fri, 6 Nov 2020 10:11:17 +0000 (10:11 +0000)]
Merge pull request #18740 from rgarnov:rg/fix_rmat_media_missing_in_standalone

3 years agofix truncate threshold example display issue in py_tutorials
junxnone [Thu, 5 Nov 2020 04:25:38 +0000 (12:25 +0800)]
fix truncate threshold example display issue in py_tutorials

Signed-off-by: junxnone <junchen0102@gmail.com>
3 years agoUse explicit opset of Unsqueeze from nGraph
Roman Kazantsev [Fri, 6 Nov 2020 06:51:40 +0000 (09:51 +0300)]
Use explicit opset of Unsqueeze from nGraph

The change is needed due to removing default opset namespace for Unsqueeze
in the scope of this refactoring activity: https://github.com/openvinotoolkit/openvino/pull/2767

Signed-off-by: Roman Kazantsev <roman.kazantsev@intel.com>