Alexander Alekhin [Mon, 13 Jun 2022 18:17:08 +0000 (18:17 +0000)]
Merge pull request #22089 from tailsu:sd/fix-displaymatrix-orientation
Stefan Dragnev [Fri, 10 Jun 2022 13:32:18 +0000 (15:32 +0200)]
correct direction of displaymatrix rotation
Alexander Alekhin [Sat, 11 Jun 2022 10:39:05 +0000 (10:39 +0000)]
Merge pull request #22079 from asmorkalov:as/calibration_save_frames
Alexander Smorkalov [Wed, 8 Jun 2022 10:59:55 +0000 (13:59 +0300)]
Save Frames option for interactive calibration tool
The option to save all frames that contribute to final calibration result.
Useful for dataset collection and further offline tuning.
Alexander Alekhin [Wed, 8 Jun 2022 20:25:24 +0000 (20:25 +0000)]
Merge pull request #22018 from RidgeRun:gstreamer-consider-video-meta-if-available
Alexander Alekhin [Sun, 5 Jun 2022 19:23:41 +0000 (19:23 +0000)]
Merge tag '4.6.0'
Alexander Alekhin [Sun, 5 Jun 2022 15:32:44 +0000 (15:32 +0000)]
release: OpenCV 4.6.0
Juan López Rubio [Sun, 5 Jun 2022 15:30:16 +0000 (17:30 +0200)]
Merge pull request #22047 from jlopezr:trackbar-ordered-in-mac
* In Mac highgui now shows trackbars in creation order
* In Mac highgui trackbars show current value
* Remove trailing spaces in objectivec code
Alexander Alekhin [Sat, 4 Jun 2022 19:10:35 +0000 (19:10 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Panov [Sat, 4 Jun 2022 14:33:08 +0000 (17:33 +0300)]
Merge pull request #22025 from AleksandrPanov:fix_samplingForVersion_multiplyingFactor
Fix sampling for version multiplying factor
* reduce experimentalFrequencyElem and listFrequencyElem
* fix large resize
* fix tile in postIntermediate
* add getMinSideLen(), add corrected_index
* add test decode_regression_21929 author Kumataro, add test decode_regression_version_25
Alexander Alekhin [Fri, 3 Jun 2022 09:03:33 +0000 (09:03 +0000)]
Merge pull request #22061 from alalek:imgproc_color_hsv_use_singleton
Alexander Alekhin [Wed, 1 Jun 2022 19:02:56 +0000 (19:02 +0000)]
imgproc: use singleton in color_hsv.simd.hpp
Alexander Alekhin [Wed, 1 Jun 2022 18:38:22 +0000 (18:38 +0000)]
Merge pull request #22059 from Kumataro:3.4-fix21899
Kumataro [Wed, 1 Jun 2022 12:45:53 +0000 (21:45 +0900)]
highgui: Qt: waitKey() supports Cyrillic/Japanese keyboard layout
Kumataro [Tue, 31 May 2022 10:58:17 +0000 (19:58 +0900)]
Merge pull request #22030 from Kumataro:3.4-fix22029
* objdetect: qrcode_encoder: fix to missing timing pattern
* objdetect: qrcode_encoder: Add SCOPED_TRACE() and replace CV_Assert() to ASSERT_EQ().
- Add SCOPED_TRACE() for version loop.
- Replace CV_Assert() to ASSERT_EQ().
- Rename expect_msg to msg.
Alexander Alekhin [Tue, 31 May 2022 10:51:55 +0000 (10:51 +0000)]
Merge pull request #22041 from nglee:fix_return_by_const_value
Alexander Alekhin [Tue, 31 May 2022 06:39:09 +0000 (06:39 +0000)]
Merge pull request #22054 from asenyaev:asen/fix_matching_xcode_version
Andrey Senyaev [Mon, 30 May 2022 22:58:50 +0000 (01:58 +0300)]
Fix Xcode version matching
Alexander Alekhin [Mon, 30 May 2022 18:27:14 +0000 (18:27 +0000)]
Merge pull request #22019 from victor1234:calib3d-fix-cameracalibration-test
Alexander Alekhin [Mon, 30 May 2022 18:21:02 +0000 (18:21 +0000)]
Merge pull request #22021 from victor1234:issue-10947_calib3d-update-fisheye-distortpoint-doc
Victor [Mon, 30 May 2022 18:03:08 +0000 (21:03 +0300)]
Merge pull request #22045 from victor1234:calib3d-fisheye-model-reference
* Add fisheye camera model summary description with reference
* Fix layout
* Move reference to bibtex
Alexander Alekhin [Sat, 28 May 2022 11:44:19 +0000 (11:44 +0000)]
Merge pull request #21843 from Rufflewind:doc
Alexander Alekhin [Sat, 28 May 2022 02:57:55 +0000 (02:57 +0000)]
Merge pull request #22034 from alalek:update_ffmpeg_4.x
Lukas-Alexander Weber [Thu, 26 May 2022 19:30:24 +0000 (21:30 +0200)]
Merge pull request #22005 from lukasalexanderweber:delete_stitching_tool
Move stitching package and tool to a dedicated repository
* deleted moved files
* Update README.md
Alexander Alekhin [Thu, 26 May 2022 19:15:39 +0000 (19:15 +0000)]
Merge pull request #22035 from mohawk2:patch-1
Namgoo Lee [Thu, 26 May 2022 12:30:41 +0000 (21:30 +0900)]
remove const from functions returning by value
mohawk2 [Wed, 25 May 2022 14:23:10 +0000 (15:23 +0100)]
typo: Minkowsky is actually Minkowski
Alexander Alekhin [Wed, 25 May 2022 11:51:31 +0000 (11:51 +0000)]
Merge pull request #22033 from alalek:windows_skip_failed_videoio_tests
Alexander Alekhin [Tue, 24 May 2022 23:35:45 +0000 (23:35 +0000)]
videoio(test): skip failed tests in misconfigured environments
Alexander Alekhin [Wed, 25 May 2022 06:39:37 +0000 (06:39 +0000)]
Merge pull request #22028 from alalek:build_warnings_4.x
Alexander Alekhin [Tue, 24 May 2022 23:44:10 +0000 (23:44 +0000)]
ffmpeg/4.x: update FFmpeg wrapper 2022.05
- FFmpeg 4.4.2
- libvpx 1.11
Alexander Alekhin [Mon, 23 May 2022 19:37:16 +0000 (19:37 +0000)]
build: eliminate warnings
Alexander Alekhin [Tue, 24 May 2022 21:37:18 +0000 (21:37 +0000)]
Merge pull request #22027 from alalek:update_version_4.6.0-pre
Alexander Alekhin [Tue, 24 May 2022 20:23:27 +0000 (20:23 +0000)]
Merge pull request #22026 from alalek:update_version_3.4.18-pre
Alexander Alekhin [Tue, 24 May 2022 19:26:02 +0000 (19:26 +0000)]
Merge pull request #22006 from rogday:21947_fix
Alexander Alekhin [Tue, 24 May 2022 08:20:26 +0000 (08:20 +0000)]
Merge pull request #22024 from berak:patch-1
rogday [Wed, 18 May 2022 20:52:56 +0000 (23:52 +0300)]
fix vector access in TF::sortByExecutionOrder
Alexander Alekhin [Mon, 23 May 2022 19:25:16 +0000 (19:25 +0000)]
pre: OpenCV 4.6.0 (version++)
Alexander Alekhin [Mon, 23 May 2022 19:18:02 +0000 (19:18 +0000)]
pre: OpenCV 3.4.18 (version++)
berak [Mon, 23 May 2022 17:18:31 +0000 (19:18 +0200)]
Update darknet_importer.cpp
make it more obvious, that this is a '404', not a 'parsing' problem
Alexander Alekhin [Mon, 23 May 2022 14:58:45 +0000 (14:58 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
rogday [Mon, 23 May 2022 14:50:42 +0000 (17:50 +0300)]
Merge pull request #21818 from rogday:revert_renaming
* add prefixes to layer names and layer output names
* dnn: OPENCV_DNN_ONNX_USE_LEGACY_NAMES runtime parameter
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Kataev Victor [Mon, 23 May 2022 11:30:09 +0000 (14:30 +0300)]
Update fisheye::distortPoints() documentation
Kataev Victor [Mon, 23 May 2022 11:06:41 +0000 (14:06 +0300)]
Fix cameracalibration test
* Remove transpose for rvec after calibration
* Change compare threshold from 110% to 10% for perViewErrors
* Add transpose to goodRotMatrs load
Phil Ruffwind [Sat, 9 Apr 2022 05:48:03 +0000 (22:48 -0700)]
Update js_usage.markdown to use onRuntimeInitialized
The Emscripten library is not guaranteed to be fully loaded during the
script element's onload event. Module.onRuntimeInitialized seems to be
more reliable.
Michael Gruner [Mon, 23 May 2022 02:08:38 +0000 (20:08 -0600)]
Consider video meta on GStreamer video capture
Some GStreamer elements may produce buffers with very non
standard strides, offsets and/or even transport each plane
in different, non-contiguous pointers. This non-standard
layout is communicated via GstVideoMeta structures attached
to the buffers. Given this, when a GstVideoMeta is available,
one should parse the layout from it instead of generating
a generic one from the caps.
The GstVideoFrame utility does precisely this: if the buffer
contains a video meta, it uses that to fill the format and
memory layout. If there is no meta available, the layout is
inferred from the caps.
Alexander Alekhin [Sun, 22 May 2022 13:42:34 +0000 (13:42 +0000)]
Merge pull request #22013 from asenyaev:asen/move_workflows_4.x
Alexander Alekhin [Sun, 22 May 2022 13:41:56 +0000 (13:41 +0000)]
Merge pull request #22001 from asenyaev:asen/move_workflows
Andrey Senyaev [Fri, 20 May 2022 16:46:56 +0000 (19:46 +0300)]
Move workflows to a dedicated repository for 4.x branch
Andrey Senyaev [Fri, 20 May 2022 11:29:43 +0000 (14:29 +0300)]
Move workflows to a dedicated repository
Alexander Alekhin [Thu, 19 May 2022 21:51:01 +0000 (21:51 +0000)]
Merge pull request #22008 from zachlowry:umat-format-string
Alexander Alekhin [Thu, 19 May 2022 17:20:04 +0000 (17:20 +0000)]
Merge pull request #21991 from fengyuentau:qconv_asympad
Martin Tůma [Thu, 19 May 2022 12:37:10 +0000 (14:37 +0200)]
Merge pull request #21992 from tumicdq:v4l2
* Added support for 4B RGB V4L2 pixel formats
Added support for V4L2_PIX_FMT_XBGR32 and V4L2_PIX_FMT_ABGR32 pixel
formats.
* Added workaround for missing V4L2_PIX_FMT_ABGR32 and V4L2_PIX_FMT_XBGR32
defines
Alexander Alekhin [Tue, 17 May 2022 21:42:36 +0000 (21:42 +0000)]
Merge pull request #21941 from cpoerschke:4.x-fix-imgproc-typos
Alexander Alekhin [Tue, 17 May 2022 21:22:16 +0000 (21:22 +0000)]
Merge pull request #21984 from xiong-jie-y:add_make_capture_for_camera_stream
Alexander Alekhin [Tue, 17 May 2022 16:27:15 +0000 (16:27 +0000)]
Merge pull request #21988 from alalek:fix_warnings_gcc12_3.4
Alexander Alekhin [Tue, 17 May 2022 16:26:13 +0000 (16:26 +0000)]
Merge pull request #21987 from alalek:gapi_test_reduce_used_memory
Alexander Alekhin [Tue, 17 May 2022 16:24:25 +0000 (16:24 +0000)]
Merge pull request #21998 from alalek:gha_fix_git_merge_fixup_21986
Andrey Senyaev [Tue, 17 May 2022 16:23:32 +0000 (19:23 +0300)]
Merge pull request #21994 from asenyaev:asen/extra_dnn_testing
Extended DNN testing in GHA
* Extended DNN testing in GHA for 3.4 branch
* Updated docker images in Linux GitHub Actions
* Added OPENCV_DOWNLOAD_PATH flag for ARM build to use pre-downloaded binaries
Alexander Alekhin [Tue, 17 May 2022 14:53:04 +0000 (14:53 +0000)]
GHA: fix git merge (part 2)
Alexander Alekhin [Mon, 16 May 2022 14:35:55 +0000 (14:35 +0000)]
Merge pull request #21986 from alalek:gha_fix_git_merge
xiong-jie-y [Sun, 15 May 2022 04:00:01 +0000 (13:00 +0900)]
Add make_capture_src for video stream to Python
fengyuentau [Mon, 16 May 2022 11:01:37 +0000 (19:01 +0800)]
support asymmetric paddings for qconv
Alexander Alekhin [Sun, 15 May 2022 16:20:45 +0000 (16:20 +0000)]
build: GCC12 warnings
dbudnikov [Sun, 15 May 2022 10:07:01 +0000 (13:07 +0300)]
Merge pull request #21909 from dbudnikov:dbudnikov/reduce_gapi_tests_number
Reduce G-API tests number
* reduce number of G-API tests
* reduce number of G-API tests
* Address more comments from Dmitry.
Alexander Alekhin [Sun, 15 May 2022 10:04:55 +0000 (10:04 +0000)]
Merge pull request #21907 from fengyuentau:workflow_arm_4.x
Alexander Alekhin [Sun, 15 May 2022 09:41:25 +0000 (09:41 +0000)]
gapi(test): reduce used amount of memory
Alexander Alekhin [Sun, 15 May 2022 09:35:38 +0000 (09:35 +0000)]
GHA: fix git merge
fengyuentau [Fri, 29 Apr 2022 03:04:06 +0000 (11:04 +0800)]
add ARM64 workflow for 4.x
add opencv_contrib fork check
use image hosted on quay.io
OpenCV Developers [Sat, 14 May 2022 11:21:33 +0000 (11:21 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
OpenCV Pushbot [Sat, 14 May 2022 11:03:17 +0000 (11:03 +0000)]
Merge pull request #21980 from asenyaev:asen/move_variables_to_the_host
Andrey Senyaev [Fri, 13 May 2022 15:14:45 +0000 (18:14 +0300)]
Move environment variables on a host side (GHA Windows)
OpenCV Pushbot [Fri, 13 May 2022 20:59:51 +0000 (20:59 +0000)]
Merge pull request #21977 from asenyaev:asen/win_contrib
OpenCV Pushbot [Fri, 13 May 2022 18:13:30 +0000 (18:13 +0000)]
Merge pull request #21964 from Julian-Sz:patch-1
Documentation Fix: Python and Java switched in Explanation
Manolis Lourakis [Fri, 13 May 2022 18:11:14 +0000 (21:11 +0300)]
Merge pull request #21702 from mlourakis:4.x
Fixes and optimizations for the SQPnP solver
* Fixes and optimizations
- optimized the calculation of qa_sum by moving equal elements outside the loop
- unrolled copying of the lower triangle of omega
- substituted SVD with eigendecomposition in the factorization of omega (2-3 times faster)
- fixed the initialization of lambda in FOAM
- added a cheirality test that checks a solution on all 3D points rather than on their mean. The old test rejected valid poses in some cases
- fixed some typos & errors in comments
* reverted to SVD
Eigen decomposition seems to yield larger errors in certain tests, reverted to SVD
* nearestRotationMatrixSVD
Added nearestRotationMatrixSVD()
Previous nearestRotationMatrix() renamed to nearestRotationMatrixFOAM() and reverts to nearestRotationMatrixSVD() for singular matrices
* fixed checks order
Fixed the order of checks in PoseSolver::solveInternal()
Andrey Senyaev [Fri, 13 May 2022 12:38:51 +0000 (15:38 +0300)]
Added opencv_contrib branch check on Windows
OpenCV Pushbot [Fri, 13 May 2022 17:34:30 +0000 (17:34 +0000)]
Merge pull request #21975 from asenyaev:asen/fix_terminating_windows_actions
Kumataro [Fri, 13 May 2022 17:32:05 +0000 (02:32 +0900)]
Merge pull request #21937 from Kumataro:4.x-fix-21911
* Fix warnings for clang15
* Fix warnings: Remove unnecessary code
* Fix warnings: Remove unnecessary code
OpenCV Pushbot [Fri, 13 May 2022 17:30:57 +0000 (17:30 +0000)]
Merge pull request #21935 from Yulv-git:3.4-typos3
OpenCV Pushbot [Fri, 13 May 2022 17:28:08 +0000 (17:28 +0000)]
Merge pull request #21933 from Yulv-git:3.4-typos1
Yuantao Feng [Fri, 13 May 2022 17:27:01 +0000 (01:27 +0800)]
Merge pull request #21924 from fengyuentau:workflow_arm64_3.4
Workflow to build and test on ARM64 for 3.4 branch
* add ARM64 workflow for 3.4
* add opencv_contrib fork check
* rename RET to OPENCV_EXTRA_FORK
OpenCV Pushbot [Fri, 13 May 2022 17:25:59 +0000 (17:25 +0000)]
Merge pull request #21871 from xiongzhen:apply-predictor-to-lzw-only
TIFFTAG_PREDICTOR should not be applied unless LZW, DEFLATE or ADOBE_DEFLATE
OpenCV Pushbot [Fri, 13 May 2022 17:23:23 +0000 (17:23 +0000)]
Merge pull request #21847 from lamm45:imgproc-tform-doc
Minor documentation fixes for geometric image transformations
xiongzhen [Fri, 13 May 2022 06:44:25 +0000 (09:44 +0300)]
Apply TIFFTAG_PREDICTOR option for LZW, DEFLATE and ADOBE_DEFLATE compression cases for smaller files.
Andrey Senyaev [Thu, 12 May 2022 22:37:55 +0000 (01:37 +0300)]
Moved from https to ssh for Windows in Github Actions
Julian Szigethy [Tue, 10 May 2022 16:11:27 +0000 (18:11 +0200)]
Fix: Python and Java switched in Explanation
OpenCV Pushbot [Thu, 12 May 2022 10:01:11 +0000 (10:01 +0000)]
Merge pull request #21916 from chenjunnn:patch-1
OpenCV Pushbot [Thu, 12 May 2022 09:02:54 +0000 (09:02 +0000)]
Merge pull request #21963 from hellodoge:imwrite_fix
OpenCV Pushbot [Thu, 12 May 2022 08:59:10 +0000 (08:59 +0000)]
Merge pull request #21954 from Darkyenus:patch-1
Victor [Thu, 12 May 2022 08:56:58 +0000 (11:56 +0300)]
Merge pull request #21931 from victor1234:calib3d-add-undistortImagePoints
Add undistortImagePoints function
* Add undistortImagePoints function
undistortPoints has unclear interface and additional functionality. New function computes only undistorted image points position
* Add undistortImagePoints test
* Add TermCriteria
* Fix layout
Andrey Senyaev [Thu, 12 May 2022 08:52:23 +0000 (11:52 +0300)]
Merge pull request #21917 from asenyaev:asen/self_hosted_runner_linux_3.4
Workflow to use a self-hosted Github runner on Linux x86_64 for 3.4 branch
* Changed a workflow to use a self-hosted Github runner for 3.4 branch
Chen Jun [Wed, 27 Apr 2022 10:13:57 +0000 (18:13 +0800)]
Fix KalmanFilter comment error
If there will be measurement before the next predict, `statePost` would be assigned to updated value. So I guess these steps are meant to handle when no measurement and KF only do the predict step.
```cpp
statePre.copyTo(statePost);
errorCovPre.copyTo(errorCovPost);
```
OpenCV Pushbot [Thu, 12 May 2022 08:46:36 +0000 (08:46 +0000)]
Merge pull request #21608 from zihaomu:depth2space
DNN: add depth2space and space2depth layer for onnx importer
OpenCV Pushbot [Thu, 12 May 2022 08:44:00 +0000 (08:44 +0000)]
Merge pull request #21974 from cxcorp:fix-js-test-globals
Sergey [Thu, 12 May 2022 08:42:38 +0000 (11:42 +0300)]
Merge pull request #21883 from SergeyIvanov87:gapi_vpl_linux
G-API: VPL Source turn on Linux CPU version
* Turn on linux compilation
* Apply comments
* Change new files headline
* Add license header
OpenCV Pushbot [Thu, 12 May 2022 07:41:39 +0000 (07:41 +0000)]
Merge pull request #21882 from duanqn:improve-doc
OpenCV Pushbot [Thu, 12 May 2022 07:40:06 +0000 (07:40 +0000)]
Merge pull request #21971 from asenyaev:asen/filtering_tests_4.x
GTest filtered list for 4.x
OpenCV Pushbot [Thu, 12 May 2022 07:39:05 +0000 (07:39 +0000)]
Merge pull request #21970 from asenyaev:asen/filtering_tests_3.4
GTest filtered list for 3.4 branch
Joona Heikkilä [Wed, 11 May 2022 20:15:34 +0000 (23:15 +0300)]
Fix global variable assignment in JS test suite
In test_imgproc.js, the test_filter suite's last test assigns a variable
to `size` without declaring it with `let`, polluting the global scope.
This commit adds `let` to the statement, so that the variable is scoped
to the test block.
Andrey Senyaev [Wed, 11 May 2022 15:08:44 +0000 (18:08 +0300)]
GTest filtered list for 4.x