platform/upstream/opencv.git
3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 12 Feb 2021 21:20:54 +0000 (21:20 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #19515 from zchrissirhcz:3.4-fix-mislinked-zlib-in-vcpkg-by-adjust...
Alexander Alekhin [Fri, 12 Feb 2021 20:28:52 +0000 (20:28 +0000)]
Merge pull request #19515 from zchrissirhcz:3.4-fix-mislinked-zlib-in-vcpkg-by-adjust-link-order

3 years agofix link order: put zlib after png/tiff/openexr
Zhuo Zhang [Fri, 12 Feb 2021 14:19:35 +0000 (22:19 +0800)]
fix link order: put zlib after png/tiff/openexr

Previous link dependency: imgcodecs --> zlib --> libpng
this can generate imgcodecs shared lib, until Visual Studio integrated
with vcpkg, which will additionally specify LIBPATH, pointing to vcpkg
installed zlib (if any), which links the wrong zlib.

Fixed link dependency: imgcodecs --> libpng --> zlib
in this fixed case, symbols in zlib referenced in libpng will be found
in the build-from-source static zlib, instead of the vcpkg one.

related discussion:
- https://github.com/microsoft/vcpkg/issues/16165
- https://github.com/opencv/opencv/issues/17051
- https://github.com/opencv/opencv/issues/10576

MSVC linking order reference pages:
- https://docs.microsoft.com/en-us/cpp/build/reference/link-input-files?view=msvc-160
  for link order
- https://docs.microsoft.com/en-us/cpp/build/reference/linking?view=msvc-160
  LIB environment variable, for library file searching
- https://docs.microsoft.com/en-us/cpp/build/reference/libpath-additional-libpath?view=msvc-160
  LIBPATH option, for library file searching

3 years agoMerge pull request #19425 from TolyaTalamanov:at/async-infer
Anatoliy Talamanov [Fri, 12 Feb 2021 12:28:37 +0000 (15:28 +0300)]
Merge pull request #19425 from TolyaTalamanov:at/async-infer

[G-API] Implement async infer

* Implement async infer

* Fix typo

3 years agoMerge pull request #19505 from alalek:hotfix_19456
Alexander Alekhin [Thu, 11 Feb 2021 18:52:56 +0000 (18:52 +0000)]
Merge pull request #19505 from alalek:hotfix_19456

3 years agocmake: use INTERFACE_COMPILE_DEFINITIONS with definition
Alexander Alekhin [Thu, 11 Feb 2021 13:47:17 +0000 (13:47 +0000)]
cmake: use INTERFACE_COMPILE_DEFINITIONS with definition

3 years agoMerge pull request #19486 from fpetrogalli:dotprod_fast-3.4
Francesco Petrogalli [Thu, 11 Feb 2021 13:24:09 +0000 (13:24 +0000)]
Merge pull request #19486 from fpetrogalli:dotprod_fast-3.4

* [hal][neon] Optimize the v_dotprod_fast intrinsics for aarch64.

On Armv8 in AArch64 execution mode, we can skip the sequence

   v<op>_<ty>(vget_high_<ty>(x), vget_high_<ty>(y))

in favour of

   v<op>_high_<ty>(x, y)

This has better changes for recent compilers to use less data movement
operations and better register allocation. See for example:

   https://godbolt.org/z/bPq7vd

* [hal][neon] Fix build failure on armv7.

* [hal][neon] Address review comments in PR.

PR: https://github.com/opencv/opencv/pull/19486

* [hal][neon] Define macro to check for the AArch64 execution state of Armv8.

* [hal][neon] Fix macro definition for AArch64.

The fix is needed to prevent warnings when building for Armv7.

3 years agoMerge pull request #19494 from derbosper:js-build-config-fix
Alexander Alekhin [Wed, 10 Feb 2021 19:43:16 +0000 (19:43 +0000)]
Merge pull request #19494 from derbosper:js-build-config-fix

3 years agoMerge pull request #19484 from UnaNancyOwen:fix_highlevelapi
Tsukasa Sugiura [Wed, 10 Feb 2021 19:42:00 +0000 (04:42 +0900)]
Merge pull request #19484 from UnaNancyOwen:fix_highlevelapi

* [dnn] fix high level api for python

* [dnn] add test_textdetection_model_db

* [dnn] fix textdetection test only check type and shape

3 years agoMerge pull request #19452 from ctuu:patch-1
Cuntian Liu [Wed, 10 Feb 2021 19:38:34 +0000 (03:38 +0800)]
Merge pull request #19452 from ctuu:patch-1

* fix: findCUDNN script

* Update FindCUDNN.cmake

3 years agoMerge pull request #19439 from raaldrid:Exif_support_for_PNG_issue_16579
Alexander Alekhin [Wed, 10 Feb 2021 19:35:31 +0000 (19:35 +0000)]
Merge pull request #19439 from raaldrid:Exif_support_for_PNG_issue_16579

3 years agoMerge pull request #19495 from dbudniko:gapi_media_frame_size
Dmitry Budnikov [Wed, 10 Feb 2021 19:23:54 +0000 (22:23 +0300)]
Merge pull request #19495 from dbudniko:gapi_media_frame_size

Add Media Frame size function and corresponding tests

* add media frame size and tests

* Address comments from Ruslan and Asya

3 years agoPass custom config file path as absolute
Mieszko Boczkowski [Wed, 10 Feb 2021 10:42:29 +0000 (11:42 +0100)]
Pass custom config file path as absolute

3 years agoMerge pull request #19480 from vrabaud:3.4
Alexander Alekhin [Tue, 9 Feb 2021 22:48:59 +0000 (22:48 +0000)]
Merge pull request #19480 from vrabaud:3.4

3 years agoMerge pull request #19488 from asmorkalov:as/nonfree_check
Alexander Alekhin [Tue, 9 Feb 2021 20:38:30 +0000 (20:38 +0000)]
Merge pull request #19488 from asmorkalov:as/nonfree_check

3 years agoMerge pull request #19471 from sturkmen72:patch-5
Alexander Alekhin [Tue, 9 Feb 2021 18:57:43 +0000 (18:57 +0000)]
Merge pull request #19471 from sturkmen72:patch-5

3 years agoExif parsing for PNG files to support Exif orientation tag. Moved decoder specific...
Rachel A [Mon, 1 Feb 2021 20:16:44 +0000 (12:16 -0800)]
Exif parsing for PNG files to support Exif orientation tag.  Moved decoder specific Exif parsing to JPEG and PNG decoders, respectively. Issue 16579

3 years agoMerge pull request #19319 from TolyaTalamanov:at/introduce-gopaque-garray-for-python
Anatoliy Talamanov [Tue, 9 Feb 2021 13:55:16 +0000 (16:55 +0300)]
Merge pull request #19319 from TolyaTalamanov:at/introduce-gopaque-garray-for-python

[G-API] Introduce GOpaque and GArray for python

* Introduce GOpaque and GArray for python

* Fix ctor

* Avoid code duplication by using macros

* gapi: move Python-specific files to misc/python

* Fix windows build

Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
3 years agoNot not test stitiching with SURF, if NONFREE is disabled
Alexander Smorkalov [Tue, 9 Feb 2021 13:54:06 +0000 (16:54 +0300)]
Not not test stitiching with SURF, if NONFREE is disabled

3 years agoDisable thread sanitization when CV_USE_GLOBAL_WORKERS_COND_VAR is not set.
Vincent Rabaud [Mon, 8 Feb 2021 15:53:37 +0000 (16:53 +0100)]
Disable thread sanitization when CV_USE_GLOBAL_WORKERS_COND_VAR is not set.

This fixes #19463

3 years agoMerge pull request #19479 from ilyachur:remove_v0_multiply
Ilya Churaev [Tue, 9 Feb 2021 09:46:28 +0000 (12:46 +0300)]
Merge pull request #19479 from ilyachur:remove_v0_multiply

* Switched to v1 Multiply

* Apply changes only for new OV

3 years agoMerge pull request #19233 from anna-khakimova:ak/simd_absdiffc
Anna Khakimova [Mon, 8 Feb 2021 13:02:35 +0000 (16:02 +0300)]
Merge pull request #19233 from anna-khakimova:ak/simd_absdiffc

GAPI: SIMD optimization for AbsDiffC kernel

* SIMD optimization for AbsDiffC kernel

* Applied comments

* Applying comments and refactoring: Remove new univ intrinsics.

* Performance experiment

* Applied comments.Step2

* Applied comments. Step3

3 years agoMerge pull request #19422 from alalek:js_tutorial_intelligent_scissors_note
Alexander Alekhin [Sun, 7 Feb 2021 20:07:18 +0000 (20:07 +0000)]
Merge pull request #19422 from alalek:js_tutorial_intelligent_scissors_note

3 years agoUpdate imageSegmentation.cpp, imageSegmentation.py
Suleyman TURKMEN [Sun, 7 Feb 2021 02:42:55 +0000 (05:42 +0300)]
Update imageSegmentation.cpp, imageSegmentation.py

3 years agoMerge pull request #19468 from hmaarrfk:fix_apple_check
Alexander Alekhin [Sat, 6 Feb 2021 14:54:49 +0000 (14:54 +0000)]
Merge pull request #19468 from hmaarrfk:fix_apple_check

3 years agoCHange import order to avoid apple check error
Mark Harfouche [Sat, 6 Feb 2021 04:24:56 +0000 (23:24 -0500)]
CHange import order to avoid apple check error

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 6 Feb 2021 00:43:06 +0000 (00:43 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #19467 from alalek:hotfix_19411
Alexander Alekhin [Sat, 6 Feb 2021 00:42:26 +0000 (00:42 +0000)]
Merge pull request #19467 from alalek:hotfix_19411

3 years agohighgui(pollKey): properly handle no-GUI case
Alexander Alekhin [Fri, 5 Feb 2021 23:50:42 +0000 (23:50 +0000)]
highgui(pollKey): properly handle no-GUI case

3 years agoMerge pull request #19466 from alalek:hotfix_19259
Alexander Alekhin [Fri, 5 Feb 2021 23:46:24 +0000 (23:46 +0000)]
Merge pull request #19466 from alalek:hotfix_19259

3 years agocore(cuda.hpp): fix GpuMatND compilation with GCC < 5
Alexander Alekhin [Fri, 5 Feb 2021 22:42:56 +0000 (22:42 +0000)]
core(cuda.hpp): fix GpuMatND compilation with GCC < 5

3 years agoMerge pull request #19407 from rayonnant14:issue_19363
Polina Smolnikova [Fri, 5 Feb 2021 21:24:27 +0000 (00:24 +0300)]
Merge pull request #19407 from rayonnant14:issue_19363

QRCodeDetector::decodeMulti() fixed invalid usage fixedType()

* fixed invalid usage fixedType()
changed default barcode type to CV_8UC1
added tests
added assert in case multi channel straight barcode input

* deleted extra wrap into OutputArray

* fix warnings

* objdetect(qr): remove unnecessary checks

Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
3 years agoMerge pull request #19259 from nglee:dev_gpumatnd1
Namgoo Lee [Fri, 5 Feb 2021 20:30:37 +0000 (05:30 +0900)]
Merge pull request #19259 from nglee:dev_gpumatnd1

Minimal implementation of GpuMatND

* GpuMatND - minimal implementation

* GpuMatND - createGpuMatHeader

* GpuMatND - GpuData, offset, getDevicePtr(), license

* reviews

* reviews

3 years agoMerge pull request #19411 from crackwitz:highgui-pollkey
Alexander Alekhin [Fri, 5 Feb 2021 20:18:53 +0000 (20:18 +0000)]
Merge pull request #19411 from crackwitz:highgui-pollkey

3 years agoMerge pull request #19451 from alalek:cmake_mkl_tbb_oneapi_workaround
Alexander Alekhin [Fri, 5 Feb 2021 14:22:43 +0000 (14:22 +0000)]
Merge pull request #19451 from alalek:cmake_mkl_tbb_oneapi_workaround

3 years agoMerge pull request #18466 from anna-khakimova:ak/simd_addw_bitwise
Anna Khakimova [Fri, 5 Feb 2021 14:21:42 +0000 (17:21 +0300)]
Merge pull request #18466 from anna-khakimova:ak/simd_addw_bitwise

GAPI: SIMD optimization for AddWeighted kernel.

* Add, sub, absdiff kernels optimization

* AddW kernel

* And, or kernels

* AddWeighted refactoring and SIMD opt for AbsDiffC kernel

* Remove simd opt of AbsDiffC kernel

* Refactoring

* Applied comments

* Refactoring.Step2

* Applied comments.Step2

3 years agoMerge pull request #19456 from alalek:fixup_19447
Alexander Alekhin [Thu, 4 Feb 2021 16:03:24 +0000 (16:03 +0000)]
Merge pull request #19456 from alalek:fixup_19447

3 years agoMerge pull request #19428 from alalek:dnn_drop_misbehaved_clamp
Alexander Alekhin [Thu, 4 Feb 2021 11:57:19 +0000 (11:57 +0000)]
Merge pull request #19428 from alalek:dnn_drop_misbehaved_clamp

3 years agoMerge pull request #19449 from SamFC10:tf-leakyrelu
Jebastin Nadar [Thu, 4 Feb 2021 08:50:08 +0000 (14:20 +0530)]
Merge pull request #19449 from SamFC10:tf-leakyrelu

* add LeakyRelu to tf-importer

* fix whitespace error

* added test for leakyrelu

3 years agodnn: rename clamp() => normalize_axis()
Alexander Alekhin [Sat, 30 Jan 2021 12:02:47 +0000 (12:02 +0000)]
dnn: rename clamp() => normalize_axis()

3 years agocmake(tbb): fix target_compile_definitions() with "UNKNOWN" target
Alexander Alekhin [Wed, 3 Feb 2021 22:16:42 +0000 (22:16 +0000)]
cmake(tbb): fix target_compile_definitions() with "UNKNOWN" target

- https://gitlab.kitware.com/cmake/cmake/-/issues/19434

3 years agocmake: workaround oneAPI problem with -DMKL_WITH_TBB=ON
Alexander Alekhin [Wed, 3 Feb 2021 15:49:59 +0000 (15:49 +0000)]
cmake: workaround oneAPI problem with -DMKL_WITH_TBB=ON

3 years agoMerge pull request #19440 from paroj:pyexcept
Alexander Alekhin [Wed, 3 Feb 2021 11:08:24 +0000 (11:08 +0000)]
Merge pull request #19440 from paroj:pyexcept

3 years agoMerge pull request #19408 from crackwitz:ogl-wndprop-vsync
Alexander Alekhin [Wed, 3 Feb 2021 09:56:57 +0000 (09:56 +0000)]
Merge pull request #19408 from crackwitz:ogl-wndprop-vsync

3 years agoMerge pull request #19286 from diablodale:add-cuda-stream-constructor
Alexander Alekhin [Wed, 3 Feb 2021 09:55:02 +0000 (09:55 +0000)]
Merge pull request #19286 from diablodale:add-cuda-stream-constructor

3 years agoMerge pull request #19435 from l-bat:lb/onnx_normalize
Alexander Alekhin [Wed, 3 Feb 2021 09:16:06 +0000 (09:16 +0000)]
Merge pull request #19435 from l-bat:lb/onnx_normalize

3 years agohighgui: expose VSYNC window property for OpenGL on W32
Christoph Rackwitz [Tue, 2 Feb 2021 20:26:13 +0000 (21:26 +0100)]
highgui: expose VSYNC window property for OpenGL on W32

property getter/setter code conditional on HAVE_OPENGL
getter: return -1 upon specific OpenGL errors

3 years agoimplementation of pollKey, companion to waitKey
Christoph Rackwitz [Mon, 1 Feb 2021 14:44:03 +0000 (15:44 +0100)]
implementation of pollKey, companion to waitKey

w32 backend: implemented
other backends: stubbed or fallback to waitKey
documentation: cross-linked and more precise in some places

3 years agoMerge pull request #19447 from alalek:cmake_tbb_workaround_msvc
Alexander Alekhin [Tue, 2 Feb 2021 20:33:26 +0000 (20:33 +0000)]
Merge pull request #19447 from alalek:cmake_tbb_workaround_msvc

3 years agopython: also catch general c++ exceptions
Pavel Rojtberg [Tue, 2 Feb 2021 01:49:19 +0000 (02:49 +0100)]
python: also catch general c++ exceptions

they might be thrown from third-party code (notably Ogre in the ovis
module).
While Linux is kind enough to print them, they cause instant termination
on Windows.
Arguably, they do not origin from OpenCV itself, but still this helps
understanding what went wrong when calling an OpenCV function.

3 years agocmake: workaround oneTBB build issues with MSVC
Alexander Alekhin [Tue, 2 Feb 2021 15:03:27 +0000 (15:03 +0000)]
cmake: workaround oneTBB build issues with MSVC

3 years agoMerge pull request #19443 from asmorkalov:as/guard_nonfree
Alexander Alekhin [Tue, 2 Feb 2021 11:12:14 +0000 (11:12 +0000)]
Merge pull request #19443 from asmorkalov:as/guard_nonfree

3 years agoGuard non-free usage in stitching as contrib can be built without it.
Alexander Smorkalov [Tue, 2 Feb 2021 10:24:59 +0000 (13:24 +0300)]
Guard non-free usage in stitching as contrib can be built without it.

3 years agoMerge pull request #19423 from LaurentBerger:houg_acc
LaurentBerger [Mon, 1 Feb 2021 21:22:10 +0000 (22:22 +0100)]
Merge pull request #19423 from LaurentBerger:houg_acc

Return accumulator value in HoughLines algorithm

* try to solve #17050

use cv_wrap_as

add python test

parameters

* review

* move wrapper to imgproc/bindings.hpp

3 years agoAdded ONNX NormalizeL2 subgraph
Liubov Batanina [Mon, 1 Feb 2021 09:38:33 +0000 (12:38 +0300)]
Added ONNX NormalizeL2 subgraph

3 years agoMerge pull request #19419 from Liangda-w:patch-1
Liangda-w [Mon, 1 Feb 2021 09:17:54 +0000 (10:17 +0100)]
Merge pull request #19419 from Liangda-w:patch-1

* Fix error in documentation for RGB->HSV convertion

* Update colors.markdown

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sun, 31 Jan 2021 17:44:15 +0000 (17:44 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #19430 from alalek:fixup_19216
Alexander Alekhin [Sun, 31 Jan 2021 17:41:24 +0000 (17:41 +0000)]
Merge pull request #19430 from alalek:fixup_19216

3 years agoMerge pull request #19427 from alalek:issue_19426
Alexander Alekhin [Sun, 31 Jan 2021 14:24:37 +0000 (14:24 +0000)]
Merge pull request #19427 from alalek:issue_19426

3 years agojs: fix SIMD build
Alexander Alekhin [Sun, 31 Jan 2021 00:12:51 +0000 (00:12 +0000)]
js: fix SIMD build

3 years agoMerge pull request #19424 from alalek:cmake_linters_update
Alexander Alekhin [Sat, 30 Jan 2021 12:37:57 +0000 (12:37 +0000)]
Merge pull request #19424 from alalek:cmake_linters_update

3 years agoMerge pull request #19057 from sl-sergei:changes_for_cuda_1d
Alexander Alekhin [Sat, 30 Jan 2021 11:39:43 +0000 (11:39 +0000)]
Merge pull request #19057 from sl-sergei:changes_for_cuda_1d

3 years agobuild: fix cv2.cpp compilation
Alexander Alekhin [Sat, 30 Jan 2021 11:32:27 +0000 (11:32 +0000)]
build: fix cv2.cpp compilation

3 years agoAlign 3.4 branch with master
Sergey Slashchinin [Tue, 8 Dec 2020 18:28:04 +0000 (21:28 +0300)]
Align 3.4 branch with master

3 years agocmake: fix pylint/flake8 detection, update flake8 exclude
Alexander Alekhin [Fri, 29 Jan 2021 16:59:13 +0000 (16:59 +0000)]
cmake: fix pylint/flake8 detection, update flake8 exclude

3 years agoMerge pull request #18943 from mpashchenkov:mp/onnx-padding
Maxim Pashchenkov [Fri, 29 Jan 2021 14:53:42 +0000 (17:53 +0300)]
Merge pull request #18943 from mpashchenkov:mp/onnx-padding

G-API: ONNX. Support for networks with three dimensional input.

* Padding without tests

* Removed padding

* Some small fixes

* Added wstring_convert

* Alignment fix, m b

* Small fixes

* Moved include from onnx.hpp

3 years agoMerge pull request #19395 from Ixarias:patch-1
Alexander Alekhin [Fri, 29 Jan 2021 12:34:00 +0000 (12:34 +0000)]
Merge pull request #19395 from Ixarias:patch-1

3 years agojs(tutorial): add note about CVAT integration
Alexander Alekhin [Fri, 29 Jan 2021 10:27:47 +0000 (10:27 +0000)]
js(tutorial): add note about CVAT integration

3 years agoMerge pull request #19370 from OlivierLDff:patch-dshow-convertrgb
Olivier Le Doeuff [Fri, 29 Jan 2021 10:18:09 +0000 (11:18 +0100)]
Merge pull request #19370 from OlivierLDff:patch-dshow-convertrgb

VideoCapture/DSHOW : Allow to set CAP_PROP_CONVERT_RGB before FOURCC/FPS/CHANNEL/WIDTH/HEIGHT.

* 🐛 cap_dshow : Allow to set CAP_PROP_CONVERT_RGB before FOURCC/FPS/CHANNEL

* 🐛 cap_dshow : fix g_VI.setConvertRGB not being called with correct boolean value on first property set.

* ✅ cap_dshow : Test CAP_PROP_CONVERT_RGB persistence

* 🚨 Fix cast from bool to double

* 🚨 Fix trailing whitespace

3 years agoMerge pull request #19384 from mshabunin:support-onetbb
Alexander Alekhin [Fri, 29 Jan 2021 06:44:36 +0000 (06:44 +0000)]
Merge pull request #19384 from mshabunin:support-onetbb

3 years agoMKL-TBB: removed tbb from dependencies list
Maksim Shabunin [Tue, 26 Jan 2021 12:52:46 +0000 (15:52 +0300)]
MKL-TBB: removed tbb from dependencies list

3 years agocore, gapi: supported build with oneTBB 2021
Maksim Shabunin [Sun, 24 Jan 2021 01:12:40 +0000 (04:12 +0300)]
core, gapi: supported build with oneTBB 2021

3 years agoMerge pull request #19413 from alalek:videoio_plugins_capture_params
Alexander Alekhin [Thu, 28 Jan 2021 15:17:36 +0000 (15:17 +0000)]
Merge pull request #19413 from alalek:videoio_plugins_capture_params

3 years agoadd cuda::Stream constructor with cuda flags
Dale Phurrough [Thu, 28 Jan 2021 15:14:01 +0000 (16:14 +0100)]
add cuda::Stream constructor with cuda flags

3 years agovideoio(plugins): support VideoCaptureParameters, CAPTURE_API_VERSION=1
Alexander Alekhin [Thu, 28 Jan 2021 06:00:38 +0000 (06:00 +0000)]
videoio(plugins): support VideoCaptureParameters, CAPTURE_API_VERSION=1

- example: ffmpeg

3 years agoMerge pull request #19394 from MaximMilashchenko:params
MaximMilashchenko [Wed, 27 Jan 2021 22:07:43 +0000 (01:07 +0300)]
Merge pull request #19394 from MaximMilashchenko:params

add video capture parameters

* add parameters

* videoio: revert unnecessary massive changes

* videoio: support capture parameters in backends API

- add tests
- FFmpeg backend sample code
- StaticBackend API is done
- support through PluginBackend API will be added later

Co-authored-by: Milashchenko <maksim.milashchenko@intel.com>
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
3 years agoMerge pull request #19404 from LupusSanctus:am/text_graph_preproc
Alexander Alekhin [Wed, 27 Jan 2021 18:32:33 +0000 (18:32 +0000)]
Merge pull request #19404 from LupusSanctus:am/text_graph_preproc

3 years agoMerge pull request #19365 from alalek:parallel_api
Alexander Alekhin [Wed, 27 Jan 2021 18:12:15 +0000 (18:12 +0000)]
Merge pull request #19365 from alalek:parallel_api

3 years agoCorrected SSD text graph generation
Anastasia Murzova [Tue, 26 Jan 2021 21:59:10 +0000 (00:59 +0300)]
Corrected SSD text graph generation

3 years agocore: parallel backends API
Alexander Alekhin [Thu, 21 Jan 2021 11:03:17 +0000 (11:03 +0000)]
core: parallel backends API

- allow to replace parallel_for() backend

3 years agoChange Keymap wording for gray image in curve mode
Ixarias [Mon, 25 Jan 2021 19:34:57 +0000 (13:34 -0600)]
Change Keymap wording for gray image in curve mode

Instead of being a copy of line 76, line 79 instead correctly indicates that it will show a histogram for a gray image in curve mode, as given by the code block at line 103 referencing image "gray" instead of image "im".

3 years agoMerge pull request #19403 from diablodale:fix_19402_python_test_filter_34
Alexander Alekhin [Tue, 26 Jan 2021 19:23:12 +0000 (19:23 +0000)]
Merge pull request #19403 from diablodale:fix_19402_python_test_filter_34

3 years agofix python test runner wildcard handling
Dale Phurrough [Tue, 26 Jan 2021 17:32:20 +0000 (18:32 +0100)]
fix python test runner wildcard handling

* fix opencv/opencv#19402

3 years agoMerge pull request #17604 from LupusSanctus:am/pytorch_tf_cls_tutorial
Anastasia M [Tue, 26 Jan 2021 11:06:15 +0000 (14:06 +0300)]
Merge pull request #17604 from LupusSanctus:am/pytorch_tf_cls_tutorial

[GSoC] Added TF and PyTorch classification conversion cases

* Added TF and PyTorch classification conversion cases

* Modified structure, some processing scripts. Added evaluation pipeline

* Minor structure change

* Removed extra functions, minor structure change

* Modified structure, code corrections

* Updated classification code block, added classification tutorials

* Added minor modifications of paths

* Classification block corrections in accordance with comments

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 25 Jan 2021 22:34:41 +0000 (22:34 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #19373 from l-bat:lb/tf_matmul_shared
Alexander Alekhin [Mon, 25 Jan 2021 22:08:24 +0000 (22:08 +0000)]
Merge pull request #19373 from l-bat:lb/tf_matmul_shared

3 years agoMerge pull request #19372 from l-bat:lb/onnx_pads_calc
Liubov Batanina [Mon, 25 Jan 2021 22:07:50 +0000 (01:07 +0300)]
Merge pull request #19372 from l-bat:lb/onnx_pads_calc

* Fixed bug with constant Div

* Supported constant mul and div for inputs with different shapes

3 years agoMerge pull request #19385 from alalek:ocl_isOpenCLActivated_update
Alexander Alekhin [Mon, 25 Jan 2021 13:54:00 +0000 (13:54 +0000)]
Merge pull request #19385 from alalek:ocl_isOpenCLActivated_update

3 years agoMerge pull request #19390 from tomoaki0705:fixCudaLegacyCalib3d
Alexander Alekhin [Mon, 25 Jan 2021 13:32:42 +0000 (13:32 +0000)]
Merge pull request #19390 from tomoaki0705:fixCudaLegacyCalib3d

3 years agoMerge pull request #19388 from GArik:orbbec
Alexander Alekhin [Mon, 25 Jan 2021 13:29:28 +0000 (13:29 +0000)]
Merge pull request #19388 from GArik:orbbec

3 years agoMerge pull request #19344 from VadimLevin:dev/vlevin/generic-sequence-conversion
Alexander Alekhin [Mon, 25 Jan 2021 08:22:57 +0000 (08:22 +0000)]
Merge pull request #19344 from VadimLevin:dev/vlevin/generic-sequence-conversion

3 years agofix peaky test failure
Tomoaki Teshima [Mon, 25 Jan 2021 08:14:37 +0000 (17:14 +0900)]
fix peaky test failure
  * follow the review comment

3 years agofeat: common fixed size sequence conversion for Python bindings
Vadim Levin [Mon, 18 Jan 2021 13:09:11 +0000 (16:09 +0300)]
feat: common fixed size sequence conversion for Python bindings

3 years agoMerge pull request #19078 from zihaomu:dasiamrpn_tracker_c_plus_plus
ZhM [Sun, 24 Jan 2021 22:22:25 +0000 (06:22 +0800)]
Merge pull request #19078 from zihaomu:dasiamrpn_tracker_c_plus_plus

Add DaSiamRPN tracker sample of c++ version

* add sample dasiamrpn_tracker of c++ version.

* samples(dasiamrpn_tracker.cpp): apply clang-format

- exclude "keys" variable

* samples(dasiamrpn_tracker.cpp): coding style and UX fixes

3 years agoMerge pull request #19380 from alalek:python_fix_rect_conversion
Alexander Alekhin [Sun, 24 Jan 2021 22:19:28 +0000 (22:19 +0000)]
Merge pull request #19380 from alalek:python_fix_rect_conversion

3 years agoSmall corrections to Orbbec Astra cameras tutorial
Igor Murzov [Wed, 23 Dec 2020 10:01:25 +0000 (13:01 +0300)]
Small corrections to Orbbec Astra cameras tutorial

3 years agoMerge pull request #19337 from OrestChura:oc/fLine_fCont_perftests
Orest Chura [Sun, 24 Jan 2021 15:41:04 +0000 (18:41 +0300)]
Merge pull request #19337 from OrestChura:oc/fLine_fCont_perftests

[G-API]: Performance tests for fitLine and findContours

* Perf.Test for findContours(H)

* Perf.Test for fitLine(2D.3D;Mat,vector<Point2i/2f/2d/3i/3f/3d>)

* Reducing the template specializations number

* Applying comments

3 years agoMerge pull request #19383 from tomoaki0705:fixWrongIndex
Alexander Alekhin [Sun, 24 Jan 2021 15:23:34 +0000 (15:23 +0000)]
Merge pull request #19383 from tomoaki0705:fixWrongIndex

3 years agoMerge pull request #19382 from crackwitz:highgui-w32-remove-gutter
Alexander Alekhin [Sun, 24 Jan 2021 15:23:03 +0000 (15:23 +0000)]
Merge pull request #19382 from crackwitz:highgui-w32-remove-gutter

3 years agofix wrong index
Tomoaki Teshima [Sun, 24 Jan 2021 11:29:52 +0000 (20:29 +0900)]
fix wrong index