platform/upstream/opencv.git
3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 1 May 2021 09:44:24 +0000 (09:44 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #20018 from lpea:doc_fixes_calib3d
Alexander Alekhin [Sat, 1 May 2021 09:35:59 +0000 (09:35 +0000)]
Merge pull request #20018 from lpea:doc_fixes_calib3d

3 years agocalib3d: Update documentation of calibrateCamera
Guillaume Jacob [Fri, 30 Apr 2021 14:30:09 +0000 (16:30 +0200)]
calib3d: Update documentation of calibrateCamera

- Added missing documentation for the CALIB_FIX_FOCAL_LENGTH flag
- Removed erroneous information about the number of distortion coefficients
returned
- Added some missing @ref tags

3 years agoMerge pull request #19956 from danielenricocahall:fix-edge-case-matcher-loop
Alexander Alekhin [Fri, 30 Apr 2021 17:22:16 +0000 (17:22 +0000)]
Merge pull request #19956 from danielenricocahall:fix-edge-case-matcher-loop

3 years agoMerge pull request #19993 from danielenricocahall:fix-compute-ecc-issue
Danny [Fri, 30 Apr 2021 17:20:52 +0000 (13:20 -0400)]
Merge pull request #19993 from danielenricocahall:fix-compute-ecc-issue

Fix unsigned int bug in computeECC

* address issue with unsigned ints in computeEcc

* remove additional logic checking firstOctave

* use swap instead of same src/dst

* simplify the unsigned check logic

3 years agoMerge pull request #20006 from alalek:dnn_ie_gpu_cache_dir
Alexander Alekhin [Fri, 30 Apr 2021 17:18:51 +0000 (17:18 +0000)]
Merge pull request #20006 from alalek:dnn_ie_gpu_cache_dir

3 years agoMerge pull request #20014 from alalek:fix_core_tls_process_termination
Alexander Alekhin [Fri, 30 Apr 2021 16:06:40 +0000 (16:06 +0000)]
Merge pull request #20014 from alalek:fix_core_tls_process_termination

3 years agocore(tls): handle process termination / cleanup issues
Alexander Alekhin [Thu, 29 Apr 2021 21:25:42 +0000 (21:25 +0000)]
core(tls): handle process termination / cleanup issues

3 years agodnn(ie): implicit usage of IE::GPU OpenCL kernels cache
Alexander Alekhin [Thu, 29 Apr 2021 09:37:14 +0000 (12:37 +0300)]
dnn(ie): implicit usage of IE::GPU OpenCL kernels cache

3 years agoMerge pull request #19998 from asmorkalov:as/openexr_version_check
Alexander Alekhin [Thu, 29 Apr 2021 09:13:46 +0000 (09:13 +0000)]
Merge pull request #19998 from asmorkalov:as/openexr_version_check

3 years agoFix OpenCV build with OpenEXR before 2.2.0.
Alexander Smorkalov [Wed, 28 Apr 2021 07:41:59 +0000 (10:41 +0300)]
Fix OpenCV build with OpenEXR before 2.2.0.

3 years agoMerge pull request #19988 from alexkalmuk:fix-squares-cpp-sample
Alexander Alekhin [Wed, 28 Apr 2021 22:03:14 +0000 (22:03 +0000)]
Merge pull request #19988 from alexkalmuk:fix-squares-cpp-sample

3 years agoMerge pull request #19984 from sturkmen72:patch-4
Alexander Alekhin [Wed, 28 Apr 2021 22:02:02 +0000 (22:02 +0000)]
Merge pull request #19984 from sturkmen72:patch-4

3 years agoFix squares sample failure when a single file passed
Alex Kalmuk [Tue, 27 Apr 2021 08:06:10 +0000 (11:06 +0300)]
Fix squares sample failure when a single file passed

3 years agoMerge pull request #19962 from mshabunin:one-vpl-support
Alexander Alekhin [Tue, 27 Apr 2021 18:40:57 +0000 (18:40 +0000)]
Merge pull request #19962 from mshabunin:one-vpl-support

3 years agoMerge pull request #19979 from micha137:patch-3
Alexander Alekhin [Tue, 27 Apr 2021 13:31:05 +0000 (13:31 +0000)]
Merge pull request #19979 from micha137:patch-3

3 years agoMerge pull request #19971 from TolyaTalamanov:at/infer-hangs-fix
Alexander Alekhin [Tue, 27 Apr 2021 10:58:13 +0000 (10:58 +0000)]
Merge pull request #19971 from TolyaTalamanov:at/infer-hangs-fix

3 years agoFix link
micha137 [Mon, 26 Apr 2021 12:01:50 +0000 (14:01 +0200)]
Fix link

3 years agoMerge pull request #19975 from danielenricocahall:fix-template-matcher-sqdiff
Alexander Alekhin [Mon, 26 Apr 2021 22:52:13 +0000 (22:52 +0000)]
Merge pull request #19975 from danielenricocahall:fix-template-matcher-sqdiff

3 years agoMerge pull request #19970 from antonio-rojas:master
Antonio Rojas [Mon, 26 Apr 2021 22:13:59 +0000 (00:13 +0200)]
Merge pull request #19970 from antonio-rojas:master

Support building with OpenEXR 3.x

* Support OpenEXR 3.0

Try to find OpenEXR 3.0 using the upstream cmake config, and fallback to the previous algorithm if not found

* Add explicit ImfFrameBuffer.h include

This was transitively included with OpenEXR 2.x, but that's no longer the case with OpenEXR 3.x

3 years agoUpdate CMakeLists.txt
Suleyman TURKMEN [Mon, 26 Apr 2021 15:36:51 +0000 (18:36 +0300)]
Update CMakeLists.txt

3 years agoMerge pull request #19983 from hartmannathan:typo-fix-download
Alexander Alekhin [Mon, 26 Apr 2021 19:25:56 +0000 (19:25 +0000)]
Merge pull request #19983 from hartmannathan:typo-fix-download

3 years agoFix typo: 'DOWNLAOD' to 'DOWNLOAD'
Nathan Hartman [Mon, 26 Apr 2021 15:01:13 +0000 (11:01 -0400)]
Fix typo: 'DOWNLAOD' to 'DOWNLOAD'

3 years agoMerge pull request #19931 from lukasalexanderweber:patch-1
Lukas-Alexander Weber [Mon, 26 Apr 2021 14:47:50 +0000 (16:47 +0200)]
Merge pull request #19931 from lukasalexanderweber:patch-1

Stitching Detailed Tutorial Improvements

* Add Vertical Wave Correction

The user has the possibility to pass "vert" as wave_correct parameter. However, in the code "cv.detail.WAVE_CORRECT_HORIZ" ist fixed. This change proposes changes so that the wave correction is done vertically if the user passes "vert" as wave_correct parameter. The variable "do_wave_correct" is replaced by None which is passed to the variable "wave_correct" if the user chooses "no" for wave correction.

* Correct fixed conf_thresh

According to the documentation, [cv.detail.leaveBiggestComponent](https://docs.opencv.org/4.5.1/d7/d74/group__stitching__rotation.html#ga855d2fccbcfc3b3477b34d415be5e786) takes features, the pairwise_matches and the conf_threshold as input.
In the tutorial, however, conf_threshold is fixed at 0.3 even though the user can pass conf_thresh as parameter which is 1 by default. Fixing this parameter at 0.3 causes the script to include images into the panorama which are not part of it.

3 years agoInitial oneVPL support
Maksim Shabunin [Thu, 15 Apr 2021 09:08:22 +0000 (12:08 +0300)]
Initial oneVPL support

3 years agoMerge pull request #19980 from zchrissirhcz:fix-CV_XADD-missing-return-type
Alexander Alekhin [Mon, 26 Apr 2021 14:10:51 +0000 (14:10 +0000)]
Merge pull request #19980 from zchrissirhcz:fix-CV_XADD-missing-return-type

3 years agoMerge pull request #19969 from alalek:issue_19850
Alexander Alekhin [Mon, 26 Apr 2021 13:23:29 +0000 (13:23 +0000)]
Merge pull request #19969 from alalek:issue_19850

3 years agoFix missing return type for unsafe CV_XADD function
Zhuo Zhang [Mon, 26 Apr 2021 12:08:45 +0000 (20:08 +0800)]
Fix missing return type for unsafe CV_XADD function

3 years agoaddress template matching sqdiff bug
danielenricocahall [Mon, 26 Apr 2021 02:17:07 +0000 (22:17 -0400)]
address template matching sqdiff bug

3 years agoMerge pull request #19934 from alalek:videoio_plugin_query_api
Alexander Alekhin [Sat, 24 Apr 2021 18:13:05 +0000 (18:13 +0000)]
Merge pull request #19934 from alalek:videoio_plugin_query_api

3 years agoFix infer hanging
Anatoliy Talamanov [Sat, 24 Apr 2021 15:02:35 +0000 (18:02 +0300)]
Fix infer hanging

3 years agodoxygen: fix quotes in add_toggle macro
Alexander Alekhin [Fri, 23 Apr 2021 22:30:06 +0000 (22:30 +0000)]
doxygen: fix quotes in add_toggle macro

3 years agoMerge pull request #19780 from HarryDC:feature/index-multiimage-tiff
Harald Scheirich [Fri, 23 Apr 2021 20:48:32 +0000 (16:48 -0400)]
Merge pull request #19780 from HarryDC:feature/index-multiimage-tiff

Add reading of specific images from multipage tiff

* Add reading of specific images from multipage tiff

* Fix build issues

* Add missing flag for gdal

* Fix unused param warning

* Remove duplicated code

* change public parameter type to int

* Fix warnings

* Fix parameter check

3 years agoMerge pull request #19923 from dbudniko:dbudniko/G-API_mtcnn_demo_PR
Dmitry Budnikov [Fri, 23 Apr 2021 10:26:53 +0000 (13:26 +0300)]
Merge pull request #19923 from dbudniko:dbudniko/G-API_mtcnn_demo_PR

G-API MTCNN sample

* add face detection demo

* clean up

* enable back accumulate

* additional input

* meta args workaround

* additional arg

* add init

* roll back

* fix shadowing

* roll back

* clean up and PNet copy from debug branch which now works

* try nets operator

* more clean up

* more clean up

* add 6 layers pyramid experimental code

* final clean up and ready for PR

* original image resize

* Remove Pnet declarations. Generic infer is used now.

* scales and sizes calculation added

* fix assert, and add ceil to size calculation

* try doubles for scales

* Address comments from Dmitry.

* use half scale option

* fix half scale

* clean up debug outputs

* try to get input image width and height

* clean up

* trailing spaces and review from Maxim

* more comments from Maxim are addressed

* try to fix warnings

* try to fix warnings and address more comments from Dmitry

* crop fix and clean up

* more warnings fixes

* more warnings fixes

* more comments from Maxim are addressed

* even more consts

* copy_n for regressions

* address more comments from Dmitry

* more comments from Maxim

3 years agoMerge pull request #19937 from Mstrodl:fix/cmake-version-change
Alexander Alekhin [Thu, 22 Apr 2021 18:21:03 +0000 (18:21 +0000)]
Merge pull request #19937 from Mstrodl:fix/cmake-version-change

3 years agoMerge pull request #19951 from stal12:3.4
Stefano Allegretti [Thu, 22 Apr 2021 18:20:12 +0000 (20:20 +0200)]
Merge pull request #19951 from stal12:3.4

* Fix #4363 - wrong hierarchy (CV_RETR_TREE) in findContours

* Add regression test for findContours

* use C++11 => C++98 on 3.4 branch

3 years agoMerge pull request #19959 from QuellaZhang:quella/c++20
Alexander Alekhin [Wed, 21 Apr 2021 18:45:37 +0000 (18:45 +0000)]
Merge pull request #19959 from QuellaZhang:quella/c++20

3 years agoMerge pull request #19961 from alvoron:dnn_ngraph_int64_fix
Aleksandr Voron [Wed, 21 Apr 2021 18:29:19 +0000 (21:29 +0300)]
Merge pull request #19961 from alvoron:dnn_ngraph_int64_fix

Explicit usage of int64_t in CropAndResizeLayer (IE backend)

* Update crop_and_resize_layer.cpp

3 years agoAdd namespace specifier for format()
Quella Zhang (Beyondsoft Corporation) [Wed, 21 Apr 2021 06:08:52 +0000 (14:08 +0800)]
Add namespace specifier for format()

3 years agofix loop boundary condition
danielenricocahall [Wed, 21 Apr 2021 02:08:01 +0000 (22:08 -0400)]
fix loop boundary condition

3 years agoMerge pull request #19942 from berak:calib3d_fix_usac_mask
Alexander Alekhin [Tue, 20 Apr 2021 19:49:20 +0000 (19:49 +0000)]
Merge pull request #19942 from berak:calib3d_fix_usac_mask

3 years agoMerge pull request #19944 from berak:patch-1
Alexander Alekhin [Tue, 20 Apr 2021 17:16:52 +0000 (17:16 +0000)]
Merge pull request #19944 from berak:patch-1

3 years agoUpdate contrast_preserve.hpp
berak [Tue, 20 Apr 2021 10:59:36 +0000 (12:59 +0200)]
Update contrast_preserve.hpp

fix a build warning:

```
C:\Slave\workspace\precommit\windows10\opencv\modules\photo\src\contrast_preserve.hpp(289): warning C4244: '=': conversion from 'double' to '_Tp', possible loss of data
        with
        [
            _Tp=float
        ]
C:\Slave\workspace\precommit\windows10\opencv\modules\photo\src\contrast_preserve.hpp(361): warning C4244: '=': conversion from 'double' to '_Tp', possible loss of data
        with
        [
            _Tp=float
        ]
```

(from https://build.opencv.org.cn/job/precommit/job/windows10/1633/console)

3 years agocalib3d: fix masks for usac
berak [Tue, 20 Apr 2021 09:57:42 +0000 (11:57 +0200)]
calib3d: fix masks for usac

3 years agoCMakeLists: remove extraneous checks, minimum required version is 3.5.1
Mary Strodl [Tue, 20 Apr 2021 01:01:37 +0000 (21:01 -0400)]
CMakeLists: remove extraneous checks, minimum required version is 3.5.1

3 years agoMerge pull request #19928 from alalek:cmake_videoio_fix_handling_of_disabled_plugins
Alexander Alekhin [Mon, 19 Apr 2021 19:05:30 +0000 (19:05 +0000)]
Merge pull request #19928 from alalek:cmake_videoio_fix_handling_of_disabled_plugins

3 years agovideoio(plugin): add query API for plugins
Alexander Alekhin [Mon, 19 Apr 2021 01:39:59 +0000 (01:39 +0000)]
videoio(plugin): add query API for plugins

3 years agocmake: fix handling of VIDEOIO_ENABLE_PLUGINS=OFF
Alexander Alekhin [Mon, 19 Apr 2021 02:01:57 +0000 (02:01 +0000)]
cmake: fix handling of VIDEOIO_ENABLE_PLUGINS=OFF

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 15 Apr 2021 20:50:26 +0000 (20:50 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agoMerge pull request #19908 from CSBVision:patch-2
Alexander Alekhin [Thu, 15 Apr 2021 20:45:30 +0000 (20:45 +0000)]
Merge pull request #19908 from CSBVision:patch-2

3 years agoMerge pull request #19913 from mshabunin:fix-san-build
Alexander Alekhin [Thu, 15 Apr 2021 11:15:37 +0000 (11:15 +0000)]
Merge pull request #19913 from mshabunin:fix-san-build

3 years agoFix header sorting for modules without headers
Maksim Shabunin [Thu, 15 Apr 2021 09:13:15 +0000 (12:13 +0300)]
Fix header sorting for modules without headers

3 years agoMerge pull request #19886 from alalek:issue_19875
Alexander Alekhin [Wed, 14 Apr 2021 16:14:44 +0000 (16:14 +0000)]
Merge pull request #19886 from alalek:issue_19875

3 years agoUpdate __init__.py to support symbolic links
CSBVision [Wed, 14 Apr 2021 10:05:53 +0000 (12:05 +0200)]
Update __init__.py to support symbolic links

Currently, the LOADER_DIR is set as os.path.dirname(os.path.abspath(__file__)). This does not point to the true library path if the cv2 folder is symlinked into the Python package directory such that importing cv2 under Python fails. The proposed change only resolves symbolic links correctly by calling os.path.realpath(__file__) first and does not change anything if __file__ contains no symbolic link.

3 years agoMerge pull request #19900 from berak:doc_fix_python_retval
Alexander Alekhin [Tue, 13 Apr 2021 17:38:06 +0000 (17:38 +0000)]
Merge pull request #19900 from berak:doc_fix_python_retval

3 years agoMerge pull request #19901 from alalek:ml_update_checks
Alexander Alekhin [Tue, 13 Apr 2021 15:47:01 +0000 (15:47 +0000)]
Merge pull request #19901 from alalek:ml_update_checks

3 years agodocs:fix python retvals
berak [Tue, 13 Apr 2021 10:51:34 +0000 (12:51 +0200)]
docs:fix python retvals

3 years agoml: update checks
Alexander Alekhin [Tue, 13 Apr 2021 11:09:14 +0000 (11:09 +0000)]
ml: update checks

3 years agoMerge pull request #19894 from alalek:fix_ml_tree_legacy_import
Alexander Alekhin [Mon, 12 Apr 2021 20:33:34 +0000 (20:33 +0000)]
Merge pull request #19894 from alalek:fix_ml_tree_legacy_import

3 years agoml: fix legacy import in DTreesImpl
Alexander Alekhin [Mon, 12 Apr 2021 19:05:52 +0000 (19:05 +0000)]
ml: fix legacy import in DTreesImpl

3 years agoMerge pull request #19851 from sturkmen72:update_documentation
Alexander Alekhin [Sun, 11 Apr 2021 21:44:02 +0000 (21:44 +0000)]
Merge pull request #19851 from sturkmen72:update_documentation

3 years agoMerge pull request #19881 from AndreiCostinescu:patch-1
Alexander Alekhin [Fri, 9 Apr 2021 16:57:13 +0000 (16:57 +0000)]
Merge pull request #19881 from AndreiCostinescu:patch-1

3 years agoMerge pull request #19884 from danielenricocahall:fix-prediction-features-bug
Danny [Fri, 9 Apr 2021 16:56:14 +0000 (12:56 -0400)]
Merge pull request #19884 from danielenricocahall:fix-prediction-features-bug

Fix bug with predictions in RTrees/Boost

* address bug where predict functions with invalid feature count in rtrees/boost models

* compact matrix rep in tests

* check 1..n-1 and n+1 in feature size validation test

3 years agocore: avoid process cleanup deadlock if TlsStorage is not used
Alexander Alekhin [Fri, 9 Apr 2021 15:46:11 +0000 (15:46 +0000)]
core: avoid process cleanup deadlock if TlsStorage is not used

3 years agoUpdate text in linux_install.markdown
Andrei Costinescu [Fri, 9 Apr 2021 05:17:20 +0000 (07:17 +0200)]
Update text in linux_install.markdown

3 years agoMerge pull request #19873 from crackwitz:issue-19870
Alexander Alekhin [Thu, 8 Apr 2021 21:55:53 +0000 (21:55 +0000)]
Merge pull request #19873 from crackwitz:issue-19870

3 years agoUpdate Documentation
Suleyman TURKMEN [Sat, 3 Apr 2021 12:11:38 +0000 (15:11 +0300)]
Update Documentation

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 8 Apr 2021 10:48:51 +0000 (10:48 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agofix for #19870
Christoph Rackwitz [Thu, 8 Apr 2021 10:59:06 +0000 (12:59 +0200)]
fix for #19870

HAVE_QT and HAVE_WIN32UI can both be true at the same time
if HAVE_QT, window_w32.cpp is not included in the build, see CMakeLists.txt

3 years agoMerge pull request #19859 from danielenricocahall:fix-blob-detector-single-thresh
Danny [Thu, 8 Apr 2021 10:39:26 +0000 (06:39 -0400)]
Merge pull request #19859 from danielenricocahall:fix-blob-detector-single-thresh

Fix Single ThresholdBug in Simple Blob Detector

* address bug with using min dist between blobs in blob detector

cast type in comparison and remove docs

address bug with using min dist between blobs in blob detector

use scalar instead of int

address bug with using min dist between blobs in blob detector

* fix namespace and formatting

3 years agoMerge pull request #19836 from 103yiran:warpaffine
Alexander Alekhin [Thu, 8 Apr 2021 10:32:26 +0000 (10:32 +0000)]
Merge pull request #19836 from 103yiran:warpaffine

3 years agoMerge pull request #19847 from gasparitiago:expose-max-iters
Alexander Alekhin [Thu, 8 Apr 2021 10:31:36 +0000 (10:31 +0000)]
Merge pull request #19847 from gasparitiago:expose-max-iters

3 years agoMerge pull request #19838 from mshabunin:fix-intel-ipp-link
Alexander Alekhin [Wed, 7 Apr 2021 09:42:32 +0000 (09:42 +0000)]
Merge pull request #19838 from mshabunin:fix-intel-ipp-link

3 years agoExpose maxIters in findEssentialMat
Tiago De Gaspari [Wed, 7 Apr 2021 01:11:03 +0000 (22:11 -0300)]
Expose maxIters in findEssentialMat

Lets the user choose the maximum number of iterations the robust
estimator runs for, similary to findFundamentalMat
and findHomography functions.

3 years agoMerge pull request #19855 from komakai:fix-android-ndk-camera-conversions
Alexander Alekhin [Tue, 6 Apr 2021 21:31:26 +0000 (21:31 +0000)]
Merge pull request #19855 from komakai:fix-android-ndk-camera-conversions

3 years agoMerge pull request #19810 from aarongreig:aaron/core/relaxClArithmTest
Alexander Alekhin [Tue, 6 Apr 2021 19:56:45 +0000 (19:56 +0000)]
Merge pull request #19810 from aarongreig:aaron/core/relaxClArithmTest

3 years agoRelax accuracy requirements in the OpenCL sqrt perf arithmetic test.
Aaron Greig [Wed, 31 Mar 2021 09:16:19 +0000 (10:16 +0100)]
Relax accuracy requirements in the OpenCL sqrt perf arithmetic test.

Also bring perf_imgproc CornerMinEigenVal accuracy requirements in line with
the test_imgproc accuracy requirements on that test and fix indentation on
the latter.

Partially addresses issue #9821

3 years agoMerge pull request #19854 from gasparitiago:fundamentalMat-fix
Alexander Alekhin [Tue, 6 Apr 2021 10:19:57 +0000 (10:19 +0000)]
Merge pull request #19854 from gasparitiago:fundamentalMat-fix

3 years agoMerge pull request #19861 from mpashchenkov:mp/ocv-gapi-stream-test
Alexander Alekhin [Mon, 5 Apr 2021 21:22:06 +0000 (21:22 +0000)]
Merge pull request #19861 from mpashchenkov:mp/ocv-gapi-stream-test

3 years agoAdded skip for TestTwoVideosDifferentLength
Maxim Pashchenkov [Mon, 5 Apr 2021 12:52:48 +0000 (15:52 +0300)]
Added skip for TestTwoVideosDifferentLength

3 years agoLog warning that Exposure/ISO have no effect unless AutoExposure is off
Giles Payne [Sun, 4 Apr 2021 13:14:40 +0000 (22:14 +0900)]
Log warning that Exposure/ISO have no effect unless AutoExposure is off

3 years agoFix Android NDK camera's color format conversions
Giles Payne [Sun, 4 Apr 2021 03:39:29 +0000 (12:39 +0900)]
Fix Android NDK camera's color format conversions

3 years agoAdd maxIters parameter to LMeDS method in findFundamentalMat
Tiago De Gaspari [Sun, 4 Apr 2021 00:56:05 +0000 (21:56 -0300)]
Add maxIters parameter to LMeDS method in findFundamentalMat

This commit passes the parameter maxIters that represent
the maximum number of iterations, that can be passed to findFundamentalMat
to the method LMeDS.

This parameter were added to the function findFundamentalMat and
were passed just for the RANSAC method, but should be passed to
both methods to be consistent.

3 years agoMerge tag '4.5.2'
Alexander Alekhin [Fri, 2 Apr 2021 17:30:52 +0000 (17:30 +0000)]
Merge tag '4.5.2'

3 years agorelease: OpenCV 4.5.2
Alexander Alekhin [Fri, 2 Apr 2021 11:23:54 +0000 (11:23 +0000)]
release: OpenCV 4.5.2

3 years agoMerge remote-tracking branch 'upstream/3.4'
Alexander Alekhin [Fri, 2 Apr 2021 11:22:33 +0000 (11:22 +0000)]
Merge remote-tracking branch 'upstream/3.4'

3 years agoMerge pull request #19833 from alalek:workaround_19678
Alexander Alekhin [Fri, 2 Apr 2021 10:37:29 +0000 (10:37 +0000)]
Merge pull request #19833 from alalek:workaround_19678

3 years agoMerge tag '3.4.14'
Alexander Alekhin [Fri, 2 Apr 2021 09:31:32 +0000 (09:31 +0000)]
Merge tag '3.4.14'

3 years agoIPP: use linker workaround for Intel compiler on Linux
Maksim Shabunin [Fri, 2 Apr 2021 07:44:32 +0000 (10:44 +0300)]
IPP: use linker workaround for Intel compiler on Linux

3 years agodelete unused variable
103yiran [Fri, 2 Apr 2021 02:30:27 +0000 (10:30 +0800)]
delete unused variable

3 years agoMerge pull request #18237 from LupusSanctus:am/pytorch_tf_det_tutorial
Anastasia M [Fri, 2 Apr 2021 01:50:35 +0000 (04:50 +0300)]
Merge pull request #18237 from LupusSanctus:am/pytorch_tf_det_tutorial

[GSoC] Added TF and PyTorch detection model conversion cases

* Added object detection convertion pipeline and tutorials

* Added tutorial corrections

3 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 1 Apr 2021 21:48:52 +0000 (21:48 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

3 years agorelease: OpenCV 3.4.14
Alexander Alekhin [Thu, 1 Apr 2021 21:37:19 +0000 (21:37 +0000)]
release: OpenCV 3.4.14

3 years agoMerge pull request #17801 from LupusSanctus:am/pytorch_tf_segm
Anastasia M [Thu, 1 Apr 2021 20:42:08 +0000 (23:42 +0300)]
Merge pull request #17801 from LupusSanctus:am/pytorch_tf_segm

[GSoC] Added TF and PyTorch segmentation conversion cases

* WIP: Added conversion of segmentation models

* Added tutorial mds

* remove unused

3 years agoMerge pull request #19828 from OrestChura:oc/fix_garray_garray_input
Orest Chura [Thu, 1 Apr 2021 20:39:31 +0000 (23:39 +0300)]
Merge pull request #19828 from OrestChura:oc/fix_garray_garray_input

[G-API] Fix bug of GArray<GArray> passing through a graph

* Add test to check GArray<GArray> passing through a graph (assertion failed)

* G-API: Flatten GArray<T> to std::vector<T> when capturing VCtr

- Also: Fix formatting in garray.hpp

* Refactored test, added valuable check

* Initialize size_t

Co-authored-by: Dmitry Matveev <dmitry.matveev@intel.com>
3 years agoMerge pull request #19823 from alalek:issue_contrib_2895
Alexander Alekhin [Thu, 1 Apr 2021 20:38:46 +0000 (20:38 +0000)]
Merge pull request #19823 from alalek:issue_contrib_2895

3 years agoMerge pull request #19817 from alalek:cmake_fix_tracking_headers
Alexander Alekhin [Thu, 1 Apr 2021 20:38:14 +0000 (20:38 +0000)]
Merge pull request #19817 from alalek:cmake_fix_tracking_headers

3 years agogapi(test): avoid compilation failure with GCC11
Alexander Alekhin [Thu, 1 Apr 2021 20:23:29 +0000 (20:23 +0000)]
gapi(test): avoid compilation failure with GCC11

3 years agoMerge pull request #19830 from alalek:issue_19368
Alexander Alekhin [Thu, 1 Apr 2021 15:30:18 +0000 (15:30 +0000)]
Merge pull request #19830 from alalek:issue_19368

3 years agoMerge pull request #19831 from alalek:backport_19771
Alexander Alekhin [Thu, 1 Apr 2021 14:05:09 +0000 (14:05 +0000)]
Merge pull request #19831 from alalek:backport_19771