Alexander Alekhin [Mon, 7 Jun 2021 17:36:44 +0000 (17:36 +0000)]
Merge pull request #20229 from alalek:fix_highgui_build
Alexander Alekhin [Fri, 4 Jun 2021 17:15:07 +0000 (17:15 +0000)]
highgui: update backends handling, fix WITH_OPENGL=ON build
Alexander Alekhin [Thu, 3 Jun 2021 16:23:36 +0000 (16:23 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 3 Jun 2021 16:20:24 +0000 (16:20 +0000)]
Merge pull request #20201 from PolarNick239:3.4
Paul Jurczak [Wed, 2 Jun 2021 19:15:52 +0000 (13:15 -0600)]
Merge pull request #20080 from pauljurczak:patch-3
* Update dnn.hpp
getPerfProfile is not supported by the CUDA backend, see https://github.com/opencv/opencv/issues/20077
* dnn.hpp: fix doxygen formatting
Alexander Alekhin [Wed, 2 Jun 2021 17:50:29 +0000 (17:50 +0000)]
Merge pull request #20146 from asmorkalov:as/java_test_filter
Alexander Alekhin [Wed, 2 Jun 2021 17:48:43 +0000 (17:48 +0000)]
Merge pull request #20149 from rogday:on_mouse_floor
Alexander Alekhin [Wed, 2 Jun 2021 16:36:40 +0000 (16:36 +0000)]
Merge pull request #20194 from mshabunin:doc-plugins
Alexander Alekhin [Wed, 2 Jun 2021 16:30:24 +0000 (16:30 +0000)]
Merge pull request #20192 from alalek:update_libjpeg-turbo
Alexander Alekhin [Wed, 2 Jun 2021 16:29:50 +0000 (16:29 +0000)]
Merge pull request #20191 from alalek:issue_20032
Dmitry Budnikov [Wed, 2 Jun 2021 16:26:22 +0000 (19:26 +0300)]
Merge pull request #20189 from dbudniko:dbudniko/mtcnn_sample_with_regular_transpose_kernel
Remove custom transpose kernel from MTCNN sample
Maksim Shabunin [Tue, 1 Jun 2021 22:54:00 +0000 (01:54 +0300)]
docs/tutorials: improve plugin sections
Nikolay Polyarniy [Wed, 2 Jun 2021 12:53:32 +0000 (15:53 +0300)]
EXR reading: support Z channel if no Y channel
Alexander Alekhin [Tue, 1 Jun 2021 19:48:49 +0000 (19:48 +0000)]
3rdparty: libjpeg-turbo 2.0.6 => 2.1.0
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.1.0
Alexander Alekhin [Tue, 1 Jun 2021 19:19:05 +0000 (19:19 +0000)]
ts: migrate from cgi.escape to html.escape in .py file
Maxim Pashchenkov [Tue, 1 Jun 2021 14:42:44 +0000 (17:42 +0300)]
Merge pull request #20157 from mpashchenkov:mp/ocv-gapi-pnetworks
G-API: Python. Wrapper for networks.
* Python networks
* Added pyopencv_to
* Changed work with pyopencv_to
rogday [Tue, 1 Jun 2021 14:00:51 +0000 (17:00 +0300)]
Merge pull request #20175 from rogday:dnn_samples_cuda
add cuda and vulkan backends to dnn samples
Alexander Alekhin [Tue, 1 Jun 2021 13:31:12 +0000 (13:31 +0000)]
Merge pull request #20150 from rogday:svm_detector_test
Alexander Alekhin [Tue, 1 Jun 2021 13:16:23 +0000 (13:16 +0000)]
Merge pull request #20187 from alalek:highgui_plugins_cleanup
Alexander Smorkalov [Mon, 24 May 2021 12:10:38 +0000 (15:10 +0300)]
Analog of gtest_filter for java tests.
Developer-Ecosystem-Engineering [Tue, 1 Jun 2021 06:39:55 +0000 (23:39 -0700)]
Merge pull request #20011 from Developer-Ecosystem-Engineering:3.4
Improve performance on Arm64
* Improve performance on Apple silicon
This patch will
- Enable dot product intrinsics for macOS arm64 builds
- Enable for macOS arm64 builds
- Improve HAL primitives
- reduction (sum, min, max, sad)
- signmask
- mul_expand
- check_any / check_all
Results on a M1 Macbook Pro
* Updates to #20011 based on feedback
- Removes Apple Silicon specific workarounds
- Makes #ifdef sections smaller for v_mul_expand cases
- Moves dot product optimization to compiler optimization check
- Adds 4x4 matrix transpose optimization
* Remove dotprod and fix v_transpose
Based on the latest, we've removed dotprod entirely and will revisit in a future PR.
Added explicit cats with v_transpose4x4()
This should resolve all opens with this PR
* Remove commented out lines
Remove two extraneous comments
Anna Prigarina [Mon, 31 May 2021 20:23:37 +0000 (23:23 +0300)]
Merge pull request #20036 from APrigarina:tracking_api
Tracking API: added DaSiamRPN tracker
* added dasiamrpn tracker
* dasiamrpn: add test, rewrite sample
* change python samples
* fix tests
* fix params
Alexander Alekhin [Fri, 28 May 2021 01:41:20 +0000 (01:41 +0000)]
highgui: cleanup and fixes
Smirnov Egor [Mon, 24 May 2021 13:39:02 +0000 (16:39 +0300)]
bring back bounds check and switch to floor
Alexander Alekhin [Mon, 31 May 2021 09:21:46 +0000 (09:21 +0000)]
Merge pull request #20182 from hanliutong:master
Danny [Sun, 30 May 2021 20:29:39 +0000 (16:29 -0400)]
Merge pull request #20054 from danielenricocahall:fix-robertson-calibration-bug
Fix Robertson Calibration NaN Bug
* add epsilon value for numerical stability in robertson merge
* update test to use range based for loop
* add comment to test
* move the epsilon
* address test comments
fix windows build warnings
fix vector type for tests
update tests
make threshold float
address test comments
fix tests and move epsilon again
* use scalar::all, move epsilon, and remove print
HAN Liutong [Sun, 30 May 2021 08:00:18 +0000 (16:00 +0800)]
Fix RVV toolchain conflicts.
Alexander Alekhin [Sat, 29 May 2021 19:00:14 +0000 (19:00 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
yo1990 [Sat, 29 May 2021 14:43:21 +0000 (23:43 +0900)]
Merge pull request #20102 from yo1990:master
Add missing sqrt to magSpectrum().
* https://github.com/opencv/opencv/issues/20100
* slight optimization + fix for double-precision case
Co-authored-by: Yuma Oyama <yuma.oyama@acuity-inc.co.jp>
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@me.com>
Jonathan Deakin [Fri, 28 May 2021 14:20:26 +0000 (15:20 +0100)]
Merge pull request #19883 from jondea:arm-neon-optimised-color-lab-3.4
* Add Neon optimised RGB2Lab conversion
* Fix compile errors, change lambda to macro
* Change NEON optimised RGB2Lab to just use HAL
* Change [] to v_extract_n in RGB2Lab
* RGB2LAB Code quality, change to nlane agnostic
* Change RGB2Lab to use function rather than macro
* Remove whitespace
Co-authored-by: Francesco Petrogalli <25690309+fpetrogalli@users.noreply.github.com>
Alexander Alekhin [Fri, 28 May 2021 14:10:17 +0000 (14:10 +0000)]
Merge pull request #20174 from alalek:issue_20159
Alexander Alekhin [Fri, 28 May 2021 14:09:52 +0000 (14:09 +0000)]
Merge pull request #20172 from alalek:fixup_19334
Alexander Alekhin [Fri, 28 May 2021 09:57:43 +0000 (09:57 +0000)]
Merge pull request #20173 from alalek:videoio_test_vp9_skip
Alexander Alekhin [Fri, 28 May 2021 01:04:07 +0000 (01:04 +0000)]
videoio(test): bailout from VP9 tests if first frame can't be read
Alexander Alekhin [Fri, 28 May 2021 01:58:58 +0000 (01:58 +0000)]
highgui: fix trackbar value pointer handling
Alexander Alekhin [Fri, 28 May 2021 00:36:56 +0000 (00:36 +0000)]
core(ocl): avoid limit of Image kernel args
Dmitry Budnikov [Thu, 27 May 2021 15:50:13 +0000 (18:50 +0300)]
Merge pull request #20155 from dbudniko:dbudniko/G-API_mtcnn_demo_queue_option
Add streaming queue capacity option choice to MTCNN G-API sample
* Add streaming queue capacity option
* trying to fix mac build
* rename face detection sample
Alexander Alekhin [Thu, 27 May 2021 07:10:28 +0000 (07:10 +0000)]
Merge pull request #20164 from mshabunin:fix-gtk-check
Maksim Shabunin [Wed, 26 May 2021 15:50:01 +0000 (18:50 +0300)]
highgui: fix config verification for GTK
Alexander Alekhin [Wed, 26 May 2021 08:32:14 +0000 (08:32 +0000)]
Merge pull request #20116 from alalek:highgui_backends
Alexander Alekhin [Wed, 26 May 2021 06:31:05 +0000 (06:31 +0000)]
Merge pull request #20158 from hyrodium:fix/latex
hyrodium [Tue, 25 May 2021 15:21:10 +0000 (00:21 +0900)]
fix latex script in the docs
Sergey Ivanov [Tue, 25 May 2021 17:36:01 +0000 (20:36 +0300)]
Merge pull request #20107 from sivanov-work:gapi_transpose_op
G-API: Add transpose operation
* Add kernels decl & def
* Add draft for UT
* Fix UT for Transpose
* Add perf test
* Fix docs
* Apply comments
damonyu1989 [Tue, 25 May 2021 17:15:12 +0000 (01:15 +0800)]
Merge pull request #19778 from damonyu1989:master-riscv-0.7.1
* Add the support for riscv64 vector 0.7.1.
* fixed GCC warnings
* cleaned whitespaces
* Remove the worning by the use of internal API of compiler.
* Update the license header.
* removed trailing whitespaces
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@me.com>
Co-authored-by: yulj <linjie.ylj@alibaba-inc.com>
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Vadim Pisarevsky [Tue, 25 May 2021 13:18:21 +0000 (13:18 +0000)]
Merge pull request #19689 from andy-held:umeyama
Vadim Pisarevsky [Tue, 25 May 2021 12:54:56 +0000 (12:54 +0000)]
Merge pull request #20135 from mightbxg:bugfix_GaussianBlur
Smirnov Egor [Mon, 24 May 2021 14:09:33 +0000 (17:09 +0300)]
add reproducer and bugfix
Anatoliy Talamanov [Mon, 24 May 2021 18:48:23 +0000 (21:48 +0300)]
Merge pull request #20119 from TolyaTalamanov:at/compile-arg-for-queue-capacity
* Support queue capacity as graph compilation argument
* Fix comments to review
* Fix comments to review
* Fix comments to review
Ilya Lavrenov [Mon, 24 May 2021 16:19:07 +0000 (19:19 +0300)]
Merge pull request #20026 from ilya-lavrenov:inference-engine-version-from-cmake
* Extract IE version from IE cmake config
* Update cmake/OpenCVDetectInferenceEngine.cmake
Co-authored-by: Maksim Shabunin <maksim.shabunin@gmail.com>
Alexander Alekhin [Sat, 1 May 2021 13:13:58 +0000 (13:13 +0000)]
highgui: backends and plugins
Alexander Alekhin [Sun, 23 May 2021 21:21:48 +0000 (21:21 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 21 May 2021 18:56:23 +0000 (18:56 +0000)]
Merge pull request #20137 from fpetrogalli:move-option
Francesco Petrogalli [Fri, 21 May 2021 12:50:08 +0000 (12:50 +0000)]
[build] Move `OPENCV_DISABLE_FILESYSTEM_SUPPORT`. [NFC]
The option as been moved away from python-related options.
Alexander Alekhin [Fri, 21 May 2021 11:01:13 +0000 (11:01 +0000)]
Merge pull request #19987 from daksayli:stitching_detailed_branch
Xinguang Bian [Fri, 21 May 2021 07:17:20 +0000 (15:17 +0800)]
fix data overflow problem in GaussianBlur
HattrickGenerator [Thu, 20 May 2021 19:21:34 +0000 (21:21 +0200)]
Merge pull request #19967 from HattrickGenerator:master
* Adding functions rbegin() and rend() functions to matrix class.
This is important to be more standard compliant with C++ and an ever increasing number of people using standard algorithms for better code readability- and maintainability.
The functions are copy pated from their counterparts (even though they should probably call the counterparts but this gave me some troube).
They return iterators using std::reverse_iterators
Follow up of an open feature request:
https://github.com/opencv/opencv/issues/4641
* Fix rbegin() and rend() and provide tests for them
* Removing unnecessary whitespaces
* Adding rbegin and rend to Mat_ class with the right parameters so we don't need to repeat the template argument.
An instantiating cv::Mat_<int> for example can call it's rbegin() function and doesn't need rbegin<int>() with this convience addition.
Follows what is done for forward iterators
* static cast the vector size (return size_t) to an int (that is required for opencv mat constructor)
Co-authored-by: Stefan <stefan.gerl@tum.de>
Anatoliy Talamanov [Thu, 20 May 2021 18:59:53 +0000 (21:59 +0300)]
Merge pull request #19982 from TolyaTalamanov:at/new-python-operation-api
G-API: New python operations API
* Reimplement test using decorators
* Custom python operation API
* Remove wip status
* python: support Python code in bindings (through loader only)
* cleanup, skip tests for Python 2.x (not supported)
* python 2.x can't skip unittest modules
* Clean up
* Clean up
* Fix segfault python3.9
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Wed, 19 May 2021 14:25:14 +0000 (14:25 +0000)]
Merge pull request #20086 from rogday:vtk9_world
Alexander Alekhin [Wed, 19 May 2021 14:19:53 +0000 (14:19 +0000)]
Merge pull request #20123 from catree:fix_tsai_park_bib_render
catree [Wed, 19 May 2021 12:24:07 +0000 (14:24 +0200)]
Use correct BibTeX syntax for month field.
thezane [Wed, 19 May 2021 09:14:11 +0000 (02:14 -0700)]
Merge pull request #20103 from thezane:make-div-spectrums-public
* Make divSpectrums public
* Add unit test
Maksym Ivashechkin [Wed, 19 May 2021 09:09:46 +0000 (10:09 +0100)]
Merge pull request #20012 from ivashmak:bugfix_solvepnp
* fix inliers in solvePnPRansac
* fix inliers in test_usac
* fix inliers in test_usac
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
Smirnov Egor [Fri, 14 May 2021 16:03:14 +0000 (19:03 +0300)]
vtk 9.0 autoinit fix
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