Alexander Alekhin [Tue, 18 May 2021 18:06:26 +0000 (18:06 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Giles Payne [Tue, 18 May 2021 14:10:51 +0000 (23:10 +0900)]
Merge pull request #20092 from komakai:disable_swift_build
Fixes for Swift troubles
* Remove NS_SWIFT_NAME override for Point, Rect, and Size due to Darwin namespace conflict
* Fix swift_type overrides in objc generator
* Add backwards compatibility Swift typealiases for Point, Rect, Size
* Add disable-swift build option to iOS/macOS builds
* Add import directive to swift source when building with disable-swift
Co-authored-by: Chris Ballinger <cballinger@rightpoint.com>
Anatoliy Talamanov [Tue, 18 May 2021 13:54:38 +0000 (16:54 +0300)]
Merge pull request #20106 from TolyaTalamanov:at/auto-convert-fp16
[G-API] IE backend convert fp32 to fp16
* Support FP16 in IE backend
Dmitry Budnikov [Tue, 18 May 2021 10:58:08 +0000 (13:58 +0300)]
Merge pull request #20065 from dbudniko:dbudniko/G-API_mtcnn_demo_PR_hotfix2
G-API MTCNN demo hotfix to align overall pipeline accuracy with the reference Python code output.
* MTCNN G-API demo aligned with Python from OMZ
* clean up
* more comments from Maxim are addressed.
* address comment from Dmitry
Alexander Alekhin [Mon, 17 May 2021 17:53:34 +0000 (17:53 +0000)]
Merge pull request #20097 from komakai:fix_qrcode_test
Giles Payne [Sun, 16 May 2021 11:52:36 +0000 (20:52 +0900)]
Fix for failing QRCodeDetectorTest.testDetectAndDecodeMulti test
Alexander Alekhin [Mon, 17 May 2021 07:26:51 +0000 (07:26 +0000)]
Merge pull request #20085 from changh95:fix_typo_calib3d_sample_code
Alexander Alekhin [Mon, 17 May 2021 07:26:25 +0000 (07:26 +0000)]
Merge pull request #20088 from alalek:cmake_module_linker_flags
changh95 [Fri, 14 May 2021 15:22:50 +0000 (00:22 +0900)]
fix typo 'undistorsed'->'undistorted'
Alexander Alekhin [Fri, 14 May 2021 17:39:40 +0000 (17:39 +0000)]
cmake: fix handling of CMAKE_MODULE_LINKER_FLAGS
Mikhail Nikolskii [Fri, 14 May 2021 16:48:50 +0000 (19:48 +0300)]
Merge pull request #19755 from mikhail-nikolskiy:ffmpeg-umat
cv::UMat output/input in VideoCapture/VideoWriter (data stays in GPU memory)
* FFMPEG with UMat input/output
* OpenCL_D3D* context
* fix Linux build
* cosmetic changes
* fix build if USE_AV_HW_CODECS=0
* simplify how child context pointer stored in parent context
* QSV interop with OpenCL on Windows
* detect_msdk.cmake via pkg-config
* fix av_buffer_ref() usage
* revert windows-decode-mfx whitelisting; remove debug msg
* address review comments
* rename property to HW_ACCELERATION_USE_OPENCL
* fix issue with "cl_khr_d3d11_sharing" extension not reported by OpenCL GPU+CPU platform
* core(ocl): add OpenCL stubs for configurations without OpenCL
* videoio(ffmpeg): update #if guards
* Put OpenCL related code under HAVE_OPENCL; simplify reuse of media context from OpenCL context
* videoio(test): skip unsupported tests
- plugins don't support OpenCL/UMat yet
- change handling of *_USE_OPENCL flag
* videoio(ffmpeg): OpenCL dependency
* videoio(ffmpeg): MediaSDK/oneVPL dependency
* cleanup, logging
* cmake: fix handling of 3rdparty interface targets
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Fri, 14 May 2021 10:56:26 +0000 (10:56 +0000)]
Merge pull request #20082 from jiangjiajun:master
Alexander Alekhin [Fri, 14 May 2021 06:09:08 +0000 (06:09 +0000)]
Merge pull request #20071 from rogday:depth_fallback_doc
jiangjiajun [Fri, 14 May 2021 03:35:44 +0000 (03:35 +0000)]
Update requirements and README for PaddlePaddle sample
Jason [Thu, 13 May 2021 18:59:41 +0000 (13:59 -0500)]
Merge pull request #19976 from jiangjiajun:master
* Added PaddlePaddle classification model conversion case
* Modify cv2 import as cv
* Modify documents in dnn_conversion/paddlepaddle
* Modify documents in dnn_conversion/paddlepaddle
Smirnov Egor [Wed, 12 May 2021 10:18:58 +0000 (13:18 +0300)]
Document imwrite depth fallback
Alexander Alekhin [Wed, 12 May 2021 11:24:50 +0000 (11:24 +0000)]
Merge pull request #20068 from TolyaTalamanov:at/disable-iebackend-autofusing
Anatoliy Talamanov [Wed, 12 May 2021 06:02:17 +0000 (09:02 +0300)]
Disable auto fusing in ie backend
Alexander Alekhin [Tue, 11 May 2021 17:06:11 +0000 (17:06 +0000)]
Merge pull request #20049 from jstaahl:jstaahl-static-inits
Alexander Alekhin [Tue, 11 May 2021 16:57:03 +0000 (16:57 +0000)]
Merge pull request #20045 from blackliner:master
Alexander Alekhin [Tue, 11 May 2021 16:34:03 +0000 (16:34 +0000)]
Merge pull request #20053 from berak:core_mat_ptr_vec
Alexander Alekhin [Tue, 11 May 2021 16:15:56 +0000 (16:15 +0000)]
Merge pull request #20010 from fpetrogalli:disable_filesystem
Francesco Petrogalli [Thu, 29 Apr 2021 16:32:51 +0000 (16:32 +0000)]
[build][option] Build option to disable filesystem support.
Alexander Alekhin [Tue, 11 May 2021 11:44:59 +0000 (14:44 +0300)]
Merge pull request #19917 from AsyaPronina:asyadev/itt_traces_in_gstreamingexecutor
Anastasiya Pronina [Mon, 12 Apr 2021 19:20:59 +0000 (22:20 +0300)]
Added ITT traces to GStreamingExecutor
berak [Sun, 9 May 2021 12:01:54 +0000 (14:01 +0200)]
core: add missing implementation for Mat::ptr(Vec)
Jake Staahl [Fri, 7 May 2021 19:48:01 +0000 (12:48 -0700)]
Remove static initializers caused by templated static member.
Florian Berchtold [Fri, 7 May 2021 13:49:24 +0000 (15:49 +0200)]
Update CMakeLists.txt
Alexander Alekhin [Fri, 7 May 2021 12:42:16 +0000 (12:42 +0000)]
Merge pull request #20033 from berak:dnn_openpose_py
berak [Wed, 5 May 2021 08:34:42 +0000 (10:34 +0200)]
samples/dnn: better errormsg in openpose.py
Alexander Alekhin [Sat, 1 May 2021 18:32:46 +0000 (18:32 +0000)]
Merge pull request #20019 from r2d3:cudaStreamCreate_bug
David Geldreich [Sat, 1 May 2021 01:18:14 +0000 (01:18 +0000)]
Stream default to Stream::Null() when no default in function prototype
this corrects bug #16592 where a Stream is created at
each GpuMat::load(arr,stream) call
a correct solution would have been to add a default to GpuMat::load
but due to circular dependence between Stream and GpuMat, this is not possible
add test_cuda_upload_download_stream to test_cuda.py
Alexander Alekhin [Sat, 1 May 2021 09:44:24 +0000 (09:44 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 1 May 2021 09:35:59 +0000 (09:35 +0000)]
Merge pull request #20018 from lpea:doc_fixes_calib3d
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
Alexander Alekhin [Fri, 30 Apr 2021 17:22:16 +0000 (17:22 +0000)]
Merge pull request #19956 from danielenricocahall:fix-edge-case-matcher-loop
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
Alexander Alekhin [Fri, 30 Apr 2021 17:18:51 +0000 (17:18 +0000)]
Merge pull request #20006 from alalek:dnn_ie_gpu_cache_dir
Alexander Alekhin [Fri, 30 Apr 2021 16:06:40 +0000 (16:06 +0000)]
Merge pull request #20014 from alalek:fix_core_tls_process_termination
Alexander Alekhin [Thu, 29 Apr 2021 21:25:42 +0000 (21:25 +0000)]
core(tls): handle process termination / cleanup issues
Alexander Alekhin [Thu, 29 Apr 2021 09:37:14 +0000 (12:37 +0300)]
dnn(ie): implicit usage of IE::GPU OpenCL kernels cache
Alexander Alekhin [Thu, 29 Apr 2021 09:13:46 +0000 (09:13 +0000)]
Merge pull request #19998 from asmorkalov:as/openexr_version_check
Alexander Smorkalov [Wed, 28 Apr 2021 07:41:59 +0000 (10:41 +0300)]
Fix OpenCV build with OpenEXR before 2.2.0.
Alexander Alekhin [Wed, 28 Apr 2021 22:03:14 +0000 (22:03 +0000)]
Merge pull request #19988 from alexkalmuk:fix-squares-cpp-sample
Alexander Alekhin [Wed, 28 Apr 2021 22:02:02 +0000 (22:02 +0000)]
Merge pull request #19984 from sturkmen72:patch-4
Alex Kalmuk [Tue, 27 Apr 2021 08:06:10 +0000 (11:06 +0300)]
Fix squares sample failure when a single file passed
Alexander Alekhin [Tue, 27 Apr 2021 18:40:57 +0000 (18:40 +0000)]
Merge pull request #19962 from mshabunin:one-vpl-support
Alexander Alekhin [Tue, 27 Apr 2021 13:31:05 +0000 (13:31 +0000)]
Merge pull request #19979 from micha137:patch-3
Alexander Alekhin [Tue, 27 Apr 2021 10:58:13 +0000 (10:58 +0000)]
Merge pull request #19971 from TolyaTalamanov:at/infer-hangs-fix
micha137 [Mon, 26 Apr 2021 12:01:50 +0000 (14:01 +0200)]
Fix link
Alexander Alekhin [Mon, 26 Apr 2021 22:52:13 +0000 (22:52 +0000)]
Merge pull request #19975 from danielenricocahall:fix-template-matcher-sqdiff
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
Suleyman TURKMEN [Mon, 26 Apr 2021 15:36:51 +0000 (18:36 +0300)]
Update CMakeLists.txt
Alexander Alekhin [Mon, 26 Apr 2021 19:25:56 +0000 (19:25 +0000)]
Merge pull request #19983 from hartmannathan:typo-fix-download
Nathan Hartman [Mon, 26 Apr 2021 15:01:13 +0000 (11:01 -0400)]
Fix typo: 'DOWNLAOD' to 'DOWNLOAD'
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.
Maksim Shabunin [Thu, 15 Apr 2021 09:08:22 +0000 (12:08 +0300)]
Initial oneVPL support
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
Alexander Alekhin [Mon, 26 Apr 2021 13:23:29 +0000 (13:23 +0000)]
Merge pull request #19969 from alalek:issue_19850
Zhuo Zhang [Mon, 26 Apr 2021 12:08:45 +0000 (20:08 +0800)]
Fix missing return type for unsafe CV_XADD function
danielenricocahall [Mon, 26 Apr 2021 02:17:07 +0000 (22:17 -0400)]
address template matching sqdiff bug
Alexander Alekhin [Sat, 24 Apr 2021 18:13:05 +0000 (18:13 +0000)]
Merge pull request #19934 from alalek:videoio_plugin_query_api
Anatoliy Talamanov [Sat, 24 Apr 2021 15:02:35 +0000 (18:02 +0300)]
Fix infer hanging
Alexander Alekhin [Fri, 23 Apr 2021 22:30:06 +0000 (22:30 +0000)]
doxygen: fix quotes in add_toggle macro
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
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
Alexander Alekhin [Thu, 22 Apr 2021 18:21:03 +0000 (18:21 +0000)]
Merge pull request #19937 from Mstrodl:fix/cmake-version-change
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
Alexander Alekhin [Wed, 21 Apr 2021 18:45:37 +0000 (18:45 +0000)]
Merge pull request #19959 from QuellaZhang:quella/c++20
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
Quella Zhang (Beyondsoft Corporation) [Wed, 21 Apr 2021 06:08:52 +0000 (14:08 +0800)]
Add namespace specifier for format()
danielenricocahall [Wed, 21 Apr 2021 02:08:01 +0000 (22:08 -0400)]
fix loop boundary condition
Alexander Alekhin [Tue, 20 Apr 2021 19:49:20 +0000 (19:49 +0000)]
Merge pull request #19942 from berak:calib3d_fix_usac_mask
Alexander Alekhin [Tue, 20 Apr 2021 17:16:52 +0000 (17:16 +0000)]
Merge pull request #19944 from berak:patch-1
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)
berak [Tue, 20 Apr 2021 09:57:42 +0000 (11:57 +0200)]
calib3d: fix masks for usac
Mary Strodl [Tue, 20 Apr 2021 01:01:37 +0000 (21:01 -0400)]
CMakeLists: remove extraneous checks, minimum required version is 3.5.1
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
Alexander Alekhin [Mon, 19 Apr 2021 01:39:59 +0000 (01:39 +0000)]
videoio(plugin): add query API for plugins
Alexander Alekhin [Mon, 19 Apr 2021 02:01:57 +0000 (02:01 +0000)]
cmake: fix handling of VIDEOIO_ENABLE_PLUGINS=OFF
Alexander Alekhin [Thu, 15 Apr 2021 20:50:26 +0000 (20:50 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 15 Apr 2021 20:45:30 +0000 (20:45 +0000)]
Merge pull request #19908 from CSBVision:patch-2
Alexander Alekhin [Thu, 15 Apr 2021 11:15:37 +0000 (11:15 +0000)]
Merge pull request #19913 from mshabunin:fix-san-build
Maksim Shabunin [Thu, 15 Apr 2021 09:13:15 +0000 (12:13 +0300)]
Fix header sorting for modules without headers
Alexander Alekhin [Wed, 14 Apr 2021 16:14:44 +0000 (16:14 +0000)]
Merge pull request #19886 from alalek:issue_19875
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.
Alexander Alekhin [Tue, 13 Apr 2021 17:38:06 +0000 (17:38 +0000)]
Merge pull request #19900 from berak:doc_fix_python_retval
Alexander Alekhin [Tue, 13 Apr 2021 15:47:01 +0000 (15:47 +0000)]
Merge pull request #19901 from alalek:ml_update_checks
berak [Tue, 13 Apr 2021 10:51:34 +0000 (12:51 +0200)]
docs:fix python retvals
Alexander Alekhin [Tue, 13 Apr 2021 11:09:14 +0000 (11:09 +0000)]
ml: update checks
Alexander Alekhin [Mon, 12 Apr 2021 20:33:34 +0000 (20:33 +0000)]
Merge pull request #19894 from alalek:fix_ml_tree_legacy_import
Alexander Alekhin [Mon, 12 Apr 2021 19:05:52 +0000 (19:05 +0000)]
ml: fix legacy import in DTreesImpl
Alexander Alekhin [Sun, 11 Apr 2021 21:44:02 +0000 (21:44 +0000)]
Merge pull request #19851 from sturkmen72:update_documentation
Alexander Alekhin [Fri, 9 Apr 2021 16:57:13 +0000 (16:57 +0000)]
Merge pull request #19881 from AndreiCostinescu:patch-1
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
Alexander Alekhin [Fri, 9 Apr 2021 15:46:11 +0000 (15:46 +0000)]
core: avoid process cleanup deadlock if TlsStorage is not used
Andrei Costinescu [Fri, 9 Apr 2021 05:17:20 +0000 (07:17 +0200)]
Update text in linux_install.markdown
Alexander Alekhin [Thu, 8 Apr 2021 21:55:53 +0000 (21:55 +0000)]
Merge pull request #19873 from crackwitz:issue-19870
Suleyman TURKMEN [Sat, 3 Apr 2021 12:11:38 +0000 (15:11 +0300)]
Update Documentation
Alexander Alekhin [Thu, 8 Apr 2021 10:48:51 +0000 (10:48 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4