platform/upstream/opencv.git
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 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 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 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 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 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 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

4 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

4 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

4 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

4 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

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

4 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

4 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>
4 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>
4 years agoAdded rmat.cpp and media.cpp to files being built in standalone
Ruslan Garnov [Thu, 5 Nov 2020 22:59:09 +0000 (01:59 +0300)]
Added rmat.cpp and media.cpp to files being built in standalone

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 5 Nov 2020 18:59:10 +0000 (18:59 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #18699 from alalek:support_ceres_2.0.0
Alexander Alekhin [Thu, 5 Nov 2020 18:55:57 +0000 (18:55 +0000)]
Merge pull request #18699 from alalek:support_ceres_2.0.0

4 years agocmake: prefer using Eigen configuration files
Alexander Alekhin [Thu, 29 Oct 2020 23:38:30 +0000 (23:38 +0000)]
cmake: prefer using Eigen configuration files

- for better compatibility with Ceres 2.0.0 CMake scripts

4 years agoMerge pull request #18736 from mshabunin:mfx-frame-size-34
Alexander Alekhin [Thu, 5 Nov 2020 17:00:35 +0000 (17:00 +0000)]
Merge pull request #18736 from mshabunin:mfx-frame-size-34

4 years agovideoio: added frameSize to MFX capture
Maksim Shabunin [Thu, 5 Nov 2020 10:11:31 +0000 (13:11 +0300)]
videoio: added frameSize to MFX capture

4 years agoMerge pull request #18719 from dmatveev:dm/upstream_desync_fix
Alexander Alekhin [Thu, 5 Nov 2020 11:20:08 +0000 (11:20 +0000)]
Merge pull request #18719 from dmatveev:dm/upstream_desync_fix

4 years agoMerge pull request #18724 from S-o-T:fix_confusing_naming_for_keypoints_comparator
Alexander Alekhin [Tue, 3 Nov 2020 20:20:11 +0000 (20:20 +0000)]
Merge pull request #18724 from S-o-T:fix_confusing_naming_for_keypoints_comparator

4 years agoChange naming of keypoints comparator
Mark Shachkov [Tue, 3 Nov 2020 18:54:56 +0000 (21:54 +0300)]
Change naming of keypoints comparator

4 years agoMerge pull request #18716 from dmatveev:dm/upstream_onnx
Dmitry Matveev [Tue, 3 Nov 2020 18:39:16 +0000 (21:39 +0300)]
Merge pull request #18716 from dmatveev:dm/upstream_onnx

* G-API: Introduce ONNX backend for Inference

- Basic operations are implemented (Infer, -ROI, -List, -List2);
- Implemented automatic preprocessing for ONNX models;
- Test suite is extended with `OPENCV_GAPI_ONNX_MODEL_PATH` env for test data
  (test data is an ONNX Model Zoo repo snapshot);
- Fixed kernel lookup logic in core G-API:
  - Lookup NN kernels not in the default package, but in the associated
    backend's aux package. Now two NN backends can work in the same graph.
- Added Infer SSD demo and a combined ONNX/IE demo;

* G-API/ONNX: Fix some of CMake issues

Co-authored-by: Pashchenkov, Maxim <maxim.pashchenkov@intel.com>
4 years agoMerge pull request #18701 from TolyaTalamanov:at/introduce-config-for-ie-params
Anatoliy Talamanov [Tue, 3 Nov 2020 17:47:05 +0000 (20:47 +0300)]
Merge pull request #18701 from TolyaTalamanov:at/introduce-config-for-ie-params

Expand ie::Params to support config

* Add config to IE params

* Add test

* Remove comments from tests

* Rename to pluginConfig

* Add one more overloads for pluginConfig

* Add more tests

4 years agoG-API: Desync -- fix the queue saturation problem
Dmitry Matveev [Wed, 28 Oct 2020 13:35:38 +0000 (16:35 +0300)]
G-API: Desync -- fix the queue saturation problem

Set queue size = 1 to Copy island right after the desync.
In this case, Copy won't read more data from a "last_written"
container than required, while feeding the desynchronized path.

Sometimes Copy don't get fused into an island and behaves
on its own -- in this case, it reads more data in advance
so the slow (desync) part actually processes some data in-sync
(more than actually required)

4 years agoMerge pull request #18651 from AsyaPronina:asyadev/add_possibility_to_check_that_gcom...
Alexander Alekhin [Mon, 2 Nov 2020 17:58:50 +0000 (17:58 +0000)]
Merge pull request #18651 from AsyaPronina:asyadev/add_possibility_to_check_that_gcompilearg_has_serialize

4 years agoChanged behaviour of cv::gapi::serialize, cv::gapi::deserialize for GCompileArgs
AsyaPronina [Mon, 2 Nov 2020 15:54:19 +0000 (18:54 +0300)]
Changed behaviour of cv::gapi::serialize, cv::gapi::deserialize for GCompileArgs

- cv::gapi::serialize bypasses compile arguments which have no S11N specialization with serialize/deserialize callbacks for underlying types
- cv::gapi::deserialize can accept arbitraty number of serialized compile args in a stream but will return only those which are requested by user via template parameter pack if they are presented in the stream. If some or all of them are not presented cv::gapi::deserialize will ignore and return only those which are presented
- cv::gapi::deserialize can accept only types which can be deserialized (have S11N<T> specialization with the user callbacks)
- Added cv::gapi::s11n::detail::has_S11N_spec<T> trait to separate compile arguments which have S11N<T> specialization with the user callbacks

4 years agoMerge pull request #18158 from legrosbuffle:3.4-vectorize-dft-radix
Alexander Alekhin [Fri, 30 Oct 2020 22:05:49 +0000 (22:05 +0000)]
Merge pull request #18158 from legrosbuffle:3.4-vectorize-dft-radix

4 years agoMerge pull request #18673 from dmatveev:dm/upstream_desync
Alexander Alekhin [Thu, 29 Oct 2020 18:55:24 +0000 (18:55 +0000)]
Merge pull request #18673 from dmatveev:dm/upstream_desync

4 years agoG-API: Introduce streaming::desync and infer(ROI)
Dmitry Matveev [Tue, 17 Mar 2020 23:38:24 +0000 (02:38 +0300)]
G-API: Introduce streaming::desync and infer(ROI)

- desync() is a new (and for now, the only one) intrinsic
  which splits the graph execution into asynchronous parts
  when running in Streaming mode;
- desync() makes no effect when compiling in Traditional mode;
- Added tests on desync() working in various scenarios;
- Extended GStreamingExecutor to support desync(); also extended
  GStreamingCompiled() with a new version of pull() returning a
  vector of optional values;
- Fixed various issues with storing the type information & proper
  construction callbacks for GArray<> and GOpaque;

- Introduced a new infer(Roi,GMat) overload with a sample;

- Introduced an internal API for Islands to control fusion
  procedure (to fuse or not to fuse);
- Introduced handleStopStream() callback for island executables;
- Added GCompileArgs to metadata of the graph (required for other
  features).

4 years agoMerge pull request #18658 from JackBoosY:master
Jack·Boos·Yu [Thu, 29 Oct 2020 13:50:25 +0000 (06:50 -0700)]
Merge pull request #18658 from JackBoosY:master

* Fix cmake configure error

* judge the cmake version

* Add comments

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 28 Oct 2020 14:41:08 +0000 (14:41 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #18672 from alalek:cmake_3rdparty_exclude_from_all
Alexander Alekhin [Wed, 28 Oct 2020 14:40:47 +0000 (14:40 +0000)]
Merge pull request #18672 from alalek:cmake_3rdparty_exclude_from_all

4 years agoMerge pull request #18685 from APrigarina:fix_curved_qrcodes
Alexander Alekhin [Wed, 28 Oct 2020 14:02:08 +0000 (14:02 +0000)]
Merge pull request #18685 from APrigarina:fix_curved_qrcodes

4 years agocmake(3rdparty): use EXCLUDE_FROM_ALL
Alexander Alekhin [Tue, 27 Oct 2020 19:00:25 +0000 (19:00 +0000)]
cmake(3rdparty): use EXCLUDE_FROM_ALL

4 years agoMerge pull request #18663 from alalek:core_cleanup_inline_code_4.x
Alexander Alekhin [Wed, 28 Oct 2020 11:40:49 +0000 (11:40 +0000)]
Merge pull request #18663 from alalek:core_cleanup_inline_code_4.x

4 years agoMerge pull request #18671 from rgarnov:rg/rmat_and_s11n_fixes
Alexander Alekhin [Wed, 28 Oct 2020 10:38:55 +0000 (10:38 +0000)]
Merge pull request #18671 from rgarnov:rg/rmat_and_s11n_fixes

4 years agofix curved qrcodes decoding
APrigarina [Wed, 28 Oct 2020 09:48:42 +0000 (12:48 +0300)]
fix curved qrcodes decoding

4 years agoMerge pull request #18664 from ackbar345:mikkel/fix-manual-page-size
Alexander Alekhin [Tue, 27 Oct 2020 17:49:21 +0000 (17:49 +0000)]
Merge pull request #18664 from ackbar345:mikkel/fix-manual-page-size

4 years agoBugfix: Manual page sizes now overwrite the default page size if they are both specif...
Mikkel Green [Mon, 26 Oct 2020 23:04:55 +0000 (16:04 -0700)]
Bugfix: Manual page sizes now overwrite the default page size if they are both specified. Remove redudant .upper() call, 1 to 1 key matching enforced
by argparse choices.

4 years agocore: move inline code from mat.inl.hpp (OpenCV 4.x additions)
Alexander Alekhin [Mon, 26 Oct 2020 22:58:30 +0000 (22:58 +0000)]
core: move inline code from mat.inl.hpp (OpenCV 4.x additions)

base commit: aac7c5465ba6ccfe0dc665ab0bae87f765e616ba

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 26 Oct 2020 20:07:47 +0000 (20:07 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #18600 from TolyaTalamanov:at/implement-render-using-stateful
Anatoliy Talamanov [Mon, 26 Oct 2020 19:55:43 +0000 (22:55 +0300)]
Merge pull request #18600 from TolyaTalamanov:at/implement-render-using-stateful

[G-API] Implement render using stateful kernel

* Implement render using stateful kernel

* Move freetype to backends folder

* Fix freetype compilation

* Fix freetype smoke test

* Fix comments

* Refactoring

4 years agoMerge pull request #18491 from TolyaTalamanov:at/wrap-inference
Anatoliy Talamanov [Mon, 26 Oct 2020 19:02:03 +0000 (22:02 +0300)]
Merge pull request #18491 from TolyaTalamanov:at/wrap-inference

[G-API] Wrap cv::gapi::infer<Generic> into python

* Introduce generic infer

* Move Generic to infer.hpp

* Removew num_outs

* Fix windows warnings

* Fix comments to review

* Fix doxygen

* Add comment

* Fix comments to review

* Wrap inference to python

* Add default ctor to Params

* Add test

* Fix clang build

* Implement GInferInputs/GInferOutputs as Pimpl

* Add checkIEtarget to infer test

* Fix path

* Supress warning

* Use getAvailableDevices insted of checkIETarget

* Move PyParams to bindings_ie

* Add namespace

* Update CMakeLists.txt

4 years agoMinor s11n and RMat improvements:
Ruslan Garnov [Sun, 25 Oct 2020 23:07:03 +0000 (02:07 +0300)]
Minor s11n and RMat improvements:

 - Changed descr_of(RMat) to use canDescribeHelper to correctly handle planar case
 - Added export of createMat
 - Added setting of Storage::INPUT and Storage::OUTPUT in deserialization routine of GComputation

4 years agoMerge pull request #18646 from qchateau:wave-auto
Quentin Chateau [Sun, 25 Oct 2020 15:58:27 +0000 (16:58 +0100)]
Merge pull request #18646 from qchateau:wave-auto

* stitching: add WAVE_CORRECT_AUTO

* stitching: use CV_EXPORTS

4 years agoMerge pull request #18640 from alalek:core_cleanup_inline_code
Alexander Alekhin [Sat, 24 Oct 2020 17:06:08 +0000 (17:06 +0000)]
Merge pull request #18640 from alalek:core_cleanup_inline_code

4 years agoMerge pull request #18003 from APrigarina:curved_qrcodes_decoding
ann [Fri, 23 Oct 2020 18:42:45 +0000 (21:42 +0300)]
Merge pull request #18003 from APrigarina:curved_qrcodes_decoding

Detection and decoding of curved QR-codes

* temp changes for curved qrcodes

* added api for curved qr code decoding

* fixed prototypes

* refactored curved qr code decoding

* refactored curved qr code decoding 2nd part

* refactored curved qr code decoding 3rd part

* refactored curved qr code decoding 4th part

* added tests for curved qr code decoding

* refactored curved qr code decoding 5th part

4 years agoMerge pull request #18633 from laelath:master
Alexander Alekhin [Fri, 23 Oct 2020 16:47:37 +0000 (16:47 +0000)]
Merge pull request #18633 from laelath:master

4 years agoMerge pull request #18637 from komakai:build-for-distribution
Giles Payne [Fri, 23 Oct 2020 11:19:36 +0000 (20:19 +0900)]
Merge pull request #18637 from komakai:build-for-distribution

Add support for Swift version independence

* Build for distribution (Swift version independence) when new Xcode build system is available

* Add module map and set "Defines Modules" flag

4 years agoFix TypeError when building for WebAssembly with Python 3
Justin Frank [Wed, 21 Oct 2020 00:31:34 +0000 (17:31 -0700)]
Fix TypeError when building for WebAssembly with Python 3

4 years agoMerge pull request #18622 from TolyaTalamanov:at/fix-namespace
Alexander Alekhin [Thu, 22 Oct 2020 17:43:23 +0000 (17:43 +0000)]
Merge pull request #18622 from TolyaTalamanov:at/fix-namespace

4 years agoMerge pull request #18641 from rtimpe:fix_cuda_stubs
Alexander Alekhin [Thu, 22 Oct 2020 12:25:55 +0000 (12:25 +0000)]
Merge pull request #18641 from rtimpe:fix_cuda_stubs

4 years agoMerge pull request #18624 from qchateau:similarity-mask
Quentin Chateau [Thu, 22 Oct 2020 12:24:58 +0000 (14:24 +0200)]
Merge pull request #18624 from qchateau:similarity-mask

* support similarity masks

* add test for similarity threshold

* short license in test

* use UMat in buildSimilarityMask

* fix win32 warnings

* fix test indentation

* fix umat/mat sync

* no in-place argument for erode/dilate

4 years agoMerge pull request #18607 from zteffi:warp-point-backward
Alexander Alekhin [Thu, 22 Oct 2020 12:22:26 +0000 (12:22 +0000)]
Merge pull request #18607 from zteffi:warp-point-backward

4 years agoMerge pull request #18476 from dmatveev:dm/gapi_text_detection
Alexander Alekhin [Thu, 22 Oct 2020 12:21:54 +0000 (12:21 +0000)]
Merge pull request #18476 from dmatveev:dm/gapi_text_detection

4 years agocore: move inline code from mat.inl.hpp
Alexander Alekhin [Wed, 21 Oct 2020 22:47:56 +0000 (22:47 +0000)]
core: move inline code from mat.inl.hpp

4 years agoFix errors when building with cuda stubs
Rob Timpe [Wed, 21 Oct 2020 22:51:46 +0000 (15:51 -0700)]
Fix errors when building with cuda stubs

Fixes two errors when building with the options WITH_CUDA=ON and BUILD_CUDA_STUBS=ON on a machine without CUDA.

In the cudaarithm module, make sure cuda_runtime.h only gets included when CUDA is installed.

In the stitching module, don't assume that cuda is present just because cudaarithm and cudawarping are present (as is the case when building with the above options).

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 21 Oct 2020 15:55:23 +0000 (15:55 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agostitching: add warpPointBackward to warpers
Martin Štefaňák [Thu, 15 Oct 2020 22:28:15 +0000 (00:28 +0200)]
stitching: add warpPointBackward to warpers

test by projecting and reprojecting back random points

4 years agoG-API: Introduced a Text Detection sample
Dmitry Matveev [Wed, 30 Sep 2020 21:18:04 +0000 (00:18 +0300)]
G-API: Introduced a Text Detection sample

This sample models the Text Detection demo from OMZ:
https://github.com/openvinotoolkit/open_model_zoo/tree/2020.4/demos/text_detection_demo

Also: renamed cv::gapi::size() to cv::gapi::streaming::size()