platform/upstream/opencv.git
3 years agoMerge pull request #17816 from vpisarev:essential_2cameras
Vadim Pisarevsky [Wed, 29 Jul 2020 13:28:01 +0000 (16:28 +0300)]
Merge pull request #17816 from vpisarev:essential_2cameras

* add findEssentialMat for two different cameras

* added smoke test for the newly added variant of findEssentialMatrix

Co-authored-by: tompollok <tom.pollok@gmail.com>
3 years agoMerge pull request #17493 from TolyaTalamanov:at/python-bindings-gapi
Anatoliy Talamanov [Wed, 29 Jul 2020 13:18:52 +0000 (16:18 +0300)]
Merge pull request #17493 from TolyaTalamanov:at/python-bindings-gapi

* Implement G-API python bindings

* Fix hdr_parser

* Drop initlization with brackets using regexp

* Handle bracket initilization another way

* Add test for core operations

* Declaration and definition of View constructor now in different files

* Refactor tests

* Remove combine decorator from tests

* Fix comment to review

* Fix test

* Fix comments to review

* Remove GCompilerArgs implementation from python

Co-authored-by: Pinaev <danil.pinaev@intel.com>
3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 28 Jul 2020 17:15:02 +0000 (17:15 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #17916 from SinM9:mish_functor_sin
Alexander Alekhin [Tue, 28 Jul 2020 17:05:58 +0000 (17:05 +0000)]
Merge pull request #17916 from SinM9:mish_functor_sin

3 years agoMerge pull request #17925 from sturkmen72:patch-2
Maksim Shabunin [Tue, 28 Jul 2020 13:18:15 +0000 (13:18 +0000)]
Merge pull request #17925 from sturkmen72:patch-2

3 years agoMerge pull request #17871 from OrestChura:oc/typed_GArray_GMat
Orest Chura [Tue, 28 Jul 2020 11:20:36 +0000 (14:20 +0300)]
Merge pull request #17871 from OrestChura:oc/typed_GArray_GMat

* Added overload for `GArray<GMat>` ProtoParam in `gtyped.hpp`

* Tests+compile_args
 - added tests for GArray<GMat> as an input and an output of GComputationT
 - added possibility to give the compile_args to GComputationT.apply()

* Fix win errors

3 years agoMerge pull request #17896 from OrestChura:oc/fix_kw_videotests
Orest Chura [Tue, 28 Jul 2020 10:25:56 +0000 (13:25 +0300)]
Merge pull request #17896 from OrestChura:oc/fix_kw_videotests

* - fix numeric overflow due to incorrect type casting
 - remove unnecessary default constructor

* Drop the cast

3 years agoMerge pull request #17928 from sturkmen72:update_samples
Maksim Shabunin [Mon, 27 Jul 2020 08:32:25 +0000 (08:32 +0000)]
Merge pull request #17928 from sturkmen72:update_samples

3 years agoMerge pull request #17943 from tomoaki0705:fixPolarToCartRounding
Maksim Shabunin [Mon, 27 Jul 2020 08:32:02 +0000 (08:32 +0000)]
Merge pull request #17943 from tomoaki0705:fixPolarToCartRounding

3 years agolet the test pass on Jetson
Tomoaki Teshima [Sat, 25 Jul 2020 14:45:51 +0000 (23:45 +0900)]
let the test pass on Jetson

3 years agoUpdate train_HOG.cpp
Suleyman TURKMEN [Thu, 23 Jul 2020 11:39:40 +0000 (14:39 +0300)]
Update train_HOG.cpp

3 years agoUpdate samples
Suleyman TURKMEN [Wed, 22 Jul 2020 04:29:56 +0000 (07:29 +0300)]
Update samples

3 years agoMerge pull request #17489 from Lapshin:ffmpeg_cap_consider_rotation_metadata_3.4
Maksim Shabunin [Thu, 23 Jul 2020 08:35:50 +0000 (08:35 +0000)]
Merge pull request #17489 from Lapshin:ffmpeg_cap_consider_rotation_metadata_3.4

3 years agoMP4 autorotation tests and various fixes for Windows
Alexander Smorkalov [Mon, 8 Jun 2020 14:31:18 +0000 (17:31 +0300)]
MP4 autorotation tests and various fixes for Windows

- Added test for automated rotation for  MP4 videos with metadata
- Fix 180 degrees rotation bug
- Moved rotation logic to cv::VideoCapture implementation for FFmpeg and restore binary compatibility with FFmpeg wrapper.

3 years agoAutorotation for mp4 streams with metadata
Alexey Lapshin [Tue, 2 Jun 2020 15:34:52 +0000 (18:34 +0300)]
Autorotation for mp4 streams with metadata

- Add VideoCapture camera orientation property for mp4 videos with camera orientation meta.
- Add auto rotation for 90, 180, 270 degrees using cv::rotate

3 years agomish_functor_update
Sinitsina [Wed, 22 Jul 2020 18:26:27 +0000 (21:26 +0300)]
mish_functor_update

3 years agoMerge pull request #17913 from asmorkalov:as/connected_components_ref
Maksim Shabunin [Wed, 22 Jul 2020 16:06:23 +0000 (16:06 +0000)]
Merge pull request #17913 from asmorkalov:as/connected_components_ref

3 years agoMerge pull request #17863 from nglee:dev_cudaDetachOutput
Maksim Shabunin [Wed, 22 Jul 2020 08:19:31 +0000 (08:19 +0000)]
Merge pull request #17863 from nglee:dev_cudaDetachOutput

3 years agoAdded reference to Original Wu's articte about SAUF connected components search method.
Alexander Smorkalov [Wed, 22 Jul 2020 07:05:55 +0000 (10:05 +0300)]
Added reference to Original Wu's articte about SAUF connected components search method.

3 years agoMerge pull request #17890 from l-bat:onnx_gather
Maksim Shabunin [Tue, 21 Jul 2020 09:38:35 +0000 (09:38 +0000)]
Merge pull request #17890 from l-bat:onnx_gather

3 years agoMerge pull request #17894 from ilyachur:feature/ichuraev/remove_copy_with_new_args
Maksim Shabunin [Tue, 21 Jul 2020 08:19:42 +0000 (08:19 +0000)]
Merge pull request #17894 from ilyachur:feature/ichuraev/remove_copy_with_new_args

3 years agoMerge pull request #17888 from ilyachur:feature/ichuraev/1324_2
Maksim Shabunin [Tue, 21 Jul 2020 08:16:31 +0000 (08:16 +0000)]
Merge pull request #17888 from ilyachur:feature/ichuraev/1324_2

3 years agoFixed removing is_parameter, is_constant, is_output
Ilya Churaev [Fri, 17 Jul 2020 11:34:06 +0000 (14:34 +0300)]
Fixed removing is_parameter, is_constant, is_output

3 years agoUse in-place npp function for inplace arguments
Namgoo Lee [Tue, 21 Jul 2020 01:27:43 +0000 (10:27 +0900)]
Use in-place npp function for inplace arguments

3 years agoMerge pull request #17887 from ilyachur:revert-17872-feature/ichuraev/1324
Maksim Shabunin [Mon, 20 Jul 2020 16:15:49 +0000 (16:15 +0000)]
Merge pull request #17887 from ilyachur:revert-17872-feature/ichuraev/1324

3 years agoReplaced copy_with_new_args to clone_with_new_inputs
Ilya Churaev [Mon, 20 Jul 2020 12:43:00 +0000 (15:43 +0300)]
Replaced copy_with_new_args to clone_with_new_inputs

3 years agoSupport Gather for variable inputs
Liubov Batanina [Mon, 20 Jul 2020 09:04:20 +0000 (12:04 +0300)]
Support Gather for variable inputs

3 years agoRevert "Fixed removing is_parameter, is_constant, is_output"
Ilya Churaev [Mon, 20 Jul 2020 04:00:09 +0000 (07:00 +0300)]
Revert "Fixed removing is_parameter, is_constant, is_output"

3 years agoMerge pull request #17872 from ilyachur:feature/ichuraev/1324
Alexander Alekhin [Sun, 19 Jul 2020 17:28:05 +0000 (17:28 +0000)]
Merge pull request #17872 from ilyachur:feature/ichuraev/1324

3 years agoMerge tag '4.4.0'
Alexander Alekhin [Fri, 17 Jul 2020 23:08:18 +0000 (23:08 +0000)]
Merge tag '4.4.0'

3 years agorelease: OpenCV 4.4.0
Alexander Alekhin [Fri, 17 Jul 2020 22:43:40 +0000 (22:43 +0000)]
release: OpenCV 4.4.0

3 years agoMerge pull request #17877 from alalek:issue_17876
Alexander Alekhin [Fri, 17 Jul 2020 22:41:57 +0000 (22:41 +0000)]
Merge pull request #17877 from alalek:issue_17876

3 years agocore(persistence): fix "use after free" bug
Alexander Alekhin [Fri, 17 Jul 2020 21:39:06 +0000 (21:39 +0000)]
core(persistence): fix "use after free" bug

- do not store user-controlled "FileStorage" pointer
- store FileStorage::Impl pointer instead

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 17 Jul 2020 17:00:54 +0000 (17:00 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #17873 from dmatveev:dm/fix_vs_infer2
Alexander Alekhin [Fri, 17 Jul 2020 17:00:06 +0000 (17:00 +0000)]
Merge pull request #17873 from dmatveev:dm/fix_vs_infer2

3 years agoG-API: Try to fix infer2 problem with VS2017
Dmitry Matveev [Fri, 17 Jul 2020 15:03:25 +0000 (18:03 +0300)]
G-API: Try to fix infer2 problem with VS2017

3 years agoFixed removing is_parameter, is_constant, is_output
Ilya Churaev [Fri, 17 Jul 2020 11:34:06 +0000 (14:34 +0300)]
Fixed removing is_parameter, is_constant, is_output

3 years agoMerge pull request #17868 from alalek:dnn_openvino_2020.4_master
Alexander Alekhin [Fri, 17 Jul 2020 10:47:12 +0000 (10:47 +0000)]
Merge pull request #17868 from alalek:dnn_openvino_2020.4_master

3 years agoMerge pull request #17841 from vpisarev:fixed_fs_dtor
Vadim Pisarevsky [Fri, 17 Jul 2020 02:28:50 +0000 (05:28 +0300)]
Merge pull request #17841 from vpisarev:fixed_fs_dtor

* fixed issue #17412

* Update test_io.cpp

3 years agoMerge tag '3.4.11'
Alexander Alekhin [Fri, 17 Jul 2020 02:06:19 +0000 (02:06 +0000)]
Merge tag '3.4.11'

3 years agodnn(test): adjust tests for OpenVINO 2020.4 (4.x branch)
Alexander Alekhin [Fri, 17 Jul 2020 00:55:31 +0000 (00:55 +0000)]
dnn(test): adjust tests for OpenVINO 2020.4 (4.x branch)

3 years agorelease: OpenCV 3.4.11
Alexander Alekhin [Fri, 17 Jul 2020 00:34:46 +0000 (00:34 +0000)]
release: OpenCV 3.4.11

3 years agoMerge pull request #17865 from alalek:add_missing_check_17036
Alexander Alekhin [Fri, 17 Jul 2020 00:28:33 +0000 (00:28 +0000)]
Merge pull request #17865 from alalek:add_missing_check_17036

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 16 Jul 2020 20:13:27 +0000 (20:13 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #17856 from alalek:dnn_openvino_2020.4.0
Alexander Alekhin [Thu, 16 Jul 2020 20:08:00 +0000 (20:08 +0000)]
Merge pull request #17856 from alalek:dnn_openvino_2020.4.0

3 years agoimgproc: add missing check into cvtColorTwoPlane()
Alexander Alekhin [Thu, 16 Jul 2020 20:01:44 +0000 (20:01 +0000)]
imgproc: add missing check into cvtColorTwoPlane()

3 years agoMerge pull request #17668 from OrestChura:oc/giebackend_migration_to_core
Orest Chura [Thu, 16 Jul 2020 18:33:35 +0000 (21:33 +0300)]
Merge pull request #17668 from OrestChura:oc/giebackend_migration_to_core

GAPI: Migration to IE Core API

* Migration to IE Core API
 - both versions are maintained
 - checked building with all the OpenVINO versions (2019.R1, R2, R3, 2020.4 (newest))

* commit to awake builders

* Addressing comments
 - migrated to Core API in 'gapi_ie_infer_test.cpp'
 - made Core a singleton object
 - dropped redundant steps

* Addressing comments
 - modified Mutex locking

* Update

* Addressing comments
 - remove getInitMutex()
 - reduce amount of #ifdef by abstracting into functions

* return to single IE::Core

* Divide functions readNet and loadNet to avoid warnings on GCC

* Fix deprecated code warnings

* Fix deprecated code warnings on CMake level

* Functions wrapped
 - All the functions depended on IE version wrapped into a cv::gapi::ie::wrap namesapace
 - All this contained to a new "giebackend/gieapi.hpp" header
 - The header shared with G-API infer tests to avoid code duplications

* Addressing comments
 - Renamed `gieapi.hpp` -> `giewrapper.hpp`, `cv::gapi::ie::wrap` -> `cv::gimpl::ie::wrap`
 - Created new `giewrapper.cpp` source file to avoid potential "multiple definition" problems
 - removed unnecessary step SetLayout() in tests

* Enabling two NN infer teest

* Two-NN infer test change for CI
 - deleted additional network
 - inference of two identical NN used instead

* Fix CI fileNotFound

* Disable MYRIAD test not to fail Custom CI runs

3 years agoMerge pull request #17764 from alalek:issue_17762
Alexander Alekhin [Thu, 16 Jul 2020 15:27:21 +0000 (15:27 +0000)]
Merge pull request #17764 from alalek:issue_17762

3 years agoMerge pull request #17842 from anton-potapov:gapi_debug_log
Alexander Alekhin [Thu, 16 Jul 2020 13:02:18 +0000 (13:02 +0000)]
Merge pull request #17842 from anton-potapov:gapi_debug_log

3 years agodnn: fix OpenCL implementation of Slice layer
Alexander Alekhin [Mon, 6 Jul 2020 14:32:42 +0000 (14:32 +0000)]
dnn: fix OpenCL implementation of Slice layer

3 years agodnn(test): adjust tests for OpenVINO 2020.4
Alexander Alekhin [Wed, 15 Jul 2020 22:52:08 +0000 (22:52 +0000)]
dnn(test): adjust tests for OpenVINO 2020.4

3 years agodnn: eliminate IE deprecation warning
Alexander Alekhin [Wed, 15 Jul 2020 22:10:45 +0000 (22:10 +0000)]
dnn: eliminate IE deprecation warning

3 years agowinpack_dldt: switch defaults to OpenVINO 2020.4
Alexander Alekhin [Wed, 15 Jul 2020 20:44:53 +0000 (20:44 +0000)]
winpack_dldt: switch defaults to OpenVINO 2020.4

3 years agodnn: use OpenVINO 2020.4 defines
Alexander Alekhin [Tue, 19 May 2020 11:48:05 +0000 (11:48 +0000)]
dnn: use OpenVINO 2020.4 defines

original commit: 2813aa7eb9c81e7bc8c765d10e508ad134f6b376

3 years agoMerge pull request #17849 from dkurt:fix_17848
Alexander Alekhin [Wed, 15 Jul 2020 18:53:46 +0000 (18:53 +0000)]
Merge pull request #17849 from dkurt:fix_17848

3 years agoMerge pull request #17818 from komakai:documentation-improvements
Giles Payne [Wed, 15 Jul 2020 18:42:05 +0000 (03:42 +0900)]
Merge pull request #17818 from komakai:documentation-improvements

Documentation fixes/improvements

* Documentation fixes/improvements

* Remove HASH_UTILS defines

3 years agoMerge pull request #17741 from aDanPin:dp/add_dinamic_graph_feature
Pinaev Danil [Wed, 15 Jul 2020 18:37:08 +0000 (21:37 +0300)]
Merge pull request #17741 from aDanPin:dp/add_dinamic_graph_feature

[G-API] Allow building graphs with a dynamic number of inputs and outputs

* Add dinamic graph feature and tests

* Remove unnecessary file

* Review response

* Add implementation of operator += for GRunArgs
And test for that case

* Tests refactoring

* Add doxygen
Review response

* Fix docs

* A small documentation fix

* Review response

* Add tests for more entities

* Add typed tests

* Another typed tests

* Doc fix

* Documentation fix

* Build fix

* Commit for rebuild

* The last one

3 years agoMerge pull request #17788 from YashasSamaga:cuda4dnn-nice-build
Alexander Alekhin [Wed, 15 Jul 2020 12:25:23 +0000 (12:25 +0000)]
Merge pull request #17788 from YashasSamaga:cuda4dnn-nice-build

3 years agoFix TensorFlow->ONNX imports
Dmitry Kurtaev [Wed, 15 Jul 2020 11:36:13 +0000 (14:36 +0300)]
Fix TensorFlow->ONNX imports

3 years agoMerge pull request #17847 from anton-potapov:gapi_own_mat_ctor_warnings
Alexander Alekhin [Wed, 15 Jul 2020 10:48:02 +0000 (10:48 +0000)]
Merge pull request #17847 from anton-potapov:gapi_own_mat_ctor_warnings

3 years agoGAPI: fix warnings in own::Mat default generated constructors/assign op
Anton Potapov [Wed, 15 Jul 2020 07:49:05 +0000 (10:49 +0300)]
GAPI: fix warnings in own::Mat default generated constructors/assign op

3 years agoGAPI: GAPI_LOG_DEBUG facility
Anton Potapov [Tue, 14 Jul 2020 22:31:25 +0000 (01:31 +0300)]
GAPI: GAPI_LOG_DEBUG facility

3 years agoMerge pull request #17502 from dmatveev:dm/infer2
Dmitry Matveev [Tue, 14 Jul 2020 08:06:49 +0000 (11:06 +0300)]
Merge pull request #17502 from dmatveev:dm/infer2

* G-API: Introduce a new gapi::infer2 overload + gaze estimation sample

* G-API/infer2: Introduced static type checking for infer2

- Also added extra tests on the type check routine

* G-API/infer2: Addressed self-review comments in the sample app

- Also fix build on Linux;

* G-API/infer2: Remove incorrect SetLayout(HWC) + dead code

- Also fixed comments in the backend

* G-API/infer2: Continue with self-review

- Fix warnings/compile errors in gaze estimation
- Dropped the use of RTTI (VectorRef::holds()) from the giebackend
- Replaced it with a trait-based enums for GArray<T> and std::vector<T>
- The enums and traits are temporary and need to be unified with
  the S11N when it comes

* G-API/infer2: Final self-review items

- Refactored ROIList test to cover 70% for infer<> and infer2<>;
- Fixed the model data discovery routine to be compatible with new
  OpenVINO;
- Hopefully fixed the final issues (warnings) with the sample.

* G-API/infer2: address review problems

- Fixed typo in comments;
- Fixed public (Doxygen) comment on GArray<GMat> input case for infer2;
- Made model lookup more flexible to allow new & old OMZ dir layouts.

* G-API/infer2: Change the model paths again

* G-API/infer2: Change the lookup path for test data

* G-API/infer2: use randu instead of imread. CI war is over

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 13 Jul 2020 19:54:49 +0000 (19:54 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #17694 from dbudniko:dbudniko/serialization_args2
Dmitry Budnikov [Mon, 13 Jul 2020 19:24:46 +0000 (22:24 +0300)]
Merge pull request #17694 from dbudniko:dbudniko/serialization_args2

G-API args serialization

* args serialization

* GRunArgP draft

* UMat added

* bind added

* DmitryM's review addressed. Code clean up required.

* fix android build

* bind test added

* more comments addressed

* try to fix Mac build

* clean up

* header-based generic implementation (GRunArg)

* clang again

* one more attempt for clang

* more clean up

* More Dmitry's comments addressed.

* monostate removed

* Top level functions and some other comments addressed.

* fix warnings

* disable warning

3 years agoMerge pull request #17830 from alalek:fix_17815
Alexander Alekhin [Mon, 13 Jul 2020 18:52:34 +0000 (18:52 +0000)]
Merge pull request #17830 from alalek:fix_17815

3 years agofeatures2d: v_fma => v_muladd for integers
Alexander Alekhin [Mon, 13 Jul 2020 17:15:41 +0000 (17:15 +0000)]
features2d: v_fma => v_muladd for integers

3 years agoMerge pull request #17806 from alalek:dnn_ie_num_threads_windows
Alexander Alekhin [Mon, 13 Jul 2020 17:12:31 +0000 (17:12 +0000)]
Merge pull request #17806 from alalek:dnn_ie_num_threads_windows

3 years agoimproved diagnostics for build issues
YashasSamaga [Mon, 13 Jul 2020 15:39:38 +0000 (21:09 +0530)]
improved diagnostics for build issues

3 years agoMerge pull request #17639 from pemmanuelviel:pev--binary-kmeans
pemmanuelviel [Mon, 13 Jul 2020 12:59:10 +0000 (14:59 +0200)]
Merge pull request #17639 from pemmanuelviel:pev--binary-kmeans

Pev binary kmeans

* Ongoing work transposing kmeans clustering method for bitfields: the computeClustering method

Ongoing work transposing kmeans clustering method for bitfields: interface computeBitfieldClustering

Fix genericity of computeNodeStatistics

Ongoing work transposing kmeans clustering method for bitfields: adapt computeNodeStatistics()

Ongoing work transposing kmeans clustering method for bitfields: adapt findNN() method

Ongoing work transposing kmeans clustering method for bitfields: allow kmeans with Hamming distance

Ongoing work transposing kmeans clustering method for bitfields: adapt distances code

Ongoing work transposing kmeans clustering method for bitfields: adapt load/save code

Ongoing work transposing kmeans clustering method for bitfields: adapt kmeans hierarchicalClustring()

PivotType -> CentersType Renaming

Fix type casting for ARM SIMD implementation of Hamming

Fix warnings with Win32 compilation

Fix warnings with Win64 compilation

Fix wrong parenthesis position on rounding

* Ensure proper rounding when CentersType is integral

3 years agoMerge pull request #17770 from jasonKercher:3.4_triggered
jasonKercher [Mon, 13 Jul 2020 12:29:54 +0000 (08:29 -0400)]
Merge pull request #17770 from jasonKercher:3.4_triggered

3.4 Allow first capture to return false

* fix first capture timeout

* fix first capture timeout

3 years agoMerge pull request #17822 from alalek:issue_17792
Alexander Alekhin [Mon, 13 Jul 2020 11:08:33 +0000 (11:08 +0000)]
Merge pull request #17822 from alalek:issue_17792

4 years agoMerge pull request #17805 from tomoaki0705:fixCUDAHostCompilerIssue
Alexander Alekhin [Sun, 12 Jul 2020 13:05:14 +0000 (13:05 +0000)]
Merge pull request #17805 from tomoaki0705:fixCUDAHostCompilerIssue

4 years agore-enable automatic CC detection on Jetson
Tomoaki Teshima [Sun, 12 Jul 2020 12:22:12 +0000 (21:22 +0900)]
re-enable automatic CC detection on Jetson
     * treat both CMAKE_C_COMPILER and c_compiler_realpath as candidate

4 years agocore: use lazy on-demand initialization for param_traceEnable
Alexander Alekhin [Sun, 12 Jul 2020 11:53:46 +0000 (11:53 +0000)]
core: use lazy on-demand initialization for param_traceEnable

4 years agoMerge pull request #17813 from hannesa2:FixTypo
Alexander Alekhin [Sat, 11 Jul 2020 19:20:49 +0000 (19:20 +0000)]
Merge pull request #17813 from hannesa2:FixTypo

4 years agoMerge pull request #17783 from dmatveev:dm/pmc_script
Alexander Alekhin [Sat, 11 Jul 2020 19:11:03 +0000 (19:11 +0000)]
Merge pull request #17783 from dmatveev:dm/pmc_script

4 years agoMerge pull request #17800 from Yosshi999:gsoc_sift-universal-intrinsic
Alexander Alekhin [Sat, 11 Jul 2020 19:09:21 +0000 (19:09 +0000)]
Merge pull request #17800 from Yosshi999:gsoc_sift-universal-intrinsic

4 years agoerror if cuda4dnn depends are not resolved
YashasSamaga [Thu, 9 Jul 2020 12:31:33 +0000 (18:01 +0530)]
error if cuda4dnn depends are not resolved

4 years agoFix typo
Hannes Achleitner [Sat, 11 Jul 2020 06:10:15 +0000 (08:10 +0200)]
Fix typo

4 years agoMerge pull request #17635 from jsxyhelu:3.4
Alexander Alekhin [Fri, 10 Jul 2020 15:11:53 +0000 (15:11 +0000)]
Merge pull request #17635 from jsxyhelu:3.4

4 years agodnn(ie): enable KEY_CPU_THREADS_NUM for Windows
Alexander Alekhin [Fri, 10 Jul 2020 14:29:21 +0000 (14:29 +0000)]
dnn(ie): enable KEY_CPU_THREADS_NUM for Windows

4 years agoUse“ moms” replace "contourArea"
jsxyhelu [Tue, 23 Jun 2020 12:39:55 +0000 (20:39 +0800)]
Use“ moms” replace "contourArea"

double area = moms.m00;
is same as
double area = contourArea(contours[contourIdx]);
Not to mention
"moms" already calculated here,"contourArea" should not apply

4 years agoMerge pull request #17791 from YashasSamaga:cuda4dnn-fix-concat-fusion
Alexander Alekhin [Fri, 10 Jul 2020 10:55:01 +0000 (10:55 +0000)]
Merge pull request #17791 from YashasSamaga:cuda4dnn-fix-concat-fusion

4 years agoMerge pull request #17772 from mshabunin:fix-match-umat-mask
Alexander Alekhin [Fri, 10 Jul 2020 10:53:55 +0000 (10:53 +0000)]
Merge pull request #17772 from mshabunin:fix-match-umat-mask

4 years agouse bufferarea for allocating buffer
Yosshi999 [Thu, 9 Jul 2020 16:50:20 +0000 (16:50 +0000)]
use bufferarea for allocating buffer

4 years agofix concat fusion for cuda4dnn
YashasSamaga [Thu, 9 Jul 2020 14:10:44 +0000 (19:40 +0530)]
fix concat fusion for cuda4dnn

4 years agoAdded test for checkMasks with UMat train descs
Maksim Shabunin [Thu, 9 Jul 2020 13:03:04 +0000 (16:03 +0300)]
Added test for checkMasks with UMat train descs

4 years agoFixed checkMasks in DescriptorMatcher with train descs in UMats
Maksim Shabunin [Tue, 7 Jul 2020 10:26:43 +0000 (13:26 +0300)]
Fixed checkMasks in DescriptorMatcher with train descs in UMats

4 years agoMerge pull request #17363 from YashasSamaga:cuda4dnn-eltwise-fusion2
Yashas Samaga B L [Thu, 9 Jul 2020 13:02:21 +0000 (18:32 +0530)]
Merge pull request #17363 from YashasSamaga:cuda4dnn-eltwise-fusion2

cuda4dnn(conv): fuse eltwise with convolutions

* fuse eltwise with convolutions

* manually rebase to avoid bad git merge

4 years agoG-API: Change the default FD model in the privacy-masking-camera
Dmitry Matveev [Thu, 9 Jul 2020 11:09:59 +0000 (14:09 +0300)]
G-API: Change the default FD model in the privacy-masking-camera

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 8 Jul 2020 21:03:43 +0000 (21:03 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17737 from pemmanuelviel:pev--fix-trees-descent
Alexander Alekhin [Wed, 8 Jul 2020 20:59:29 +0000 (20:59 +0000)]
Merge pull request #17737 from pemmanuelviel:pev--fix-trees-descent

4 years agoMerge pull request #17707 from Yosshi999:gsoc_sift-universal-intrinsic
Alexander Alekhin [Wed, 8 Jul 2020 20:33:40 +0000 (20:33 +0000)]
Merge pull request #17707 from Yosshi999:gsoc_sift-universal-intrinsic

4 years agoMerge pull request #17748 from YashasSamaga:cuda4dnn-data-parallel
Alexander Alekhin [Wed, 8 Jul 2020 20:20:19 +0000 (20:20 +0000)]
Merge pull request #17748 from YashasSamaga:cuda4dnn-data-parallel

4 years agoMerge pull request #17674 from alalek:issue_16214
Alexander Alekhin [Wed, 8 Jul 2020 20:01:35 +0000 (20:01 +0000)]
Merge pull request #17674 from alalek:issue_16214

4 years agoMerge pull request #17777 from alalek:backport_cuda_cmake
Alexander Alekhin [Wed, 8 Jul 2020 20:00:12 +0000 (20:00 +0000)]
Merge pull request #17777 from alalek:backport_cuda_cmake

4 years agoMerge pull request #17745 from alalek:cuda_fix_ccbin
Alexander Alekhin [Wed, 8 Jul 2020 19:59:42 +0000 (19:59 +0000)]
Merge pull request #17745 from alalek:cuda_fix_ccbin

4 years agoAdded a script to measure & report privacy masking camera performance in different...
Dmitry Matveev [Wed, 8 Jul 2020 16:19:37 +0000 (19:19 +0300)]
Added a script to measure & report privacy masking camera performance in different configurations

4 years agoimgproc: align GaussianBlur/sepFilter2D OpenCL with CPU version
Alexander Alekhin [Fri, 26 Jun 2020 22:31:02 +0000 (22:31 +0000)]
imgproc: align GaussianBlur/sepFilter2D OpenCL with CPU version