Zihao Mu [Fri, 1 Jul 2022 10:03:15 +0000 (18:03 +0800)]
Merge pull request #21910 from zihaomu:fast_conv_ARM
DNN: Accelerating convolution
* Fast Conv of ARM, X86 and universal intrinsics.
* improve code style.
* error fixed.
* improve the License
* optimize memory allocated and Adjust the threshold.
* change FasterRCNN_vgg16 to 2GB memory.
rogday [Thu, 30 Jun 2022 20:31:52 +0000 (23:31 +0300)]
Merge pull request #22147 from rogday:zoom_factor
Add zoom factor to interactive calibration tool
* add zoom factor
* address review comments
Alexander Alekhin [Sun, 26 Jun 2022 14:21:40 +0000 (14:21 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sun, 26 Jun 2022 14:20:22 +0000 (14:20 +0000)]
Merge pull request #22158 from lamm45:intro-typos
Alexander Alekhin [Sat, 25 Jun 2022 15:21:55 +0000 (15:21 +0000)]
Merge pull request #22137 from danopdev:issues-22126
dan [Sat, 25 Jun 2022 13:12:59 +0000 (15:12 +0200)]
issues-22126
Sean McBride [Sat, 25 Jun 2022 03:48:22 +0000 (23:48 -0400)]
Merge pull request #22149 from seanm:sprintf
Replaced sprintf with safer snprintf
* Straightforward replacement of sprintf with safer snprintf
* Trickier replacement of sprintf with safer snprintf
Some functions were changed to take another parameter: the size of the buffer, so that they can pass that size on to snprintf.
lamm45 [Fri, 24 Jun 2022 17:49:40 +0000 (13:49 -0400)]
Fix minor errors in the first documentation page (Introduction)
This markdown file corresponds to the first link on the landing
page of OpenCV documentation.
Alexander Alekhin [Thu, 23 Jun 2022 22:35:36 +0000 (22:35 +0000)]
Merge pull request #22148 from zihaomu:gemm_onnx_bug_fix_branch34
Zihao Mu [Wed, 22 Jun 2022 13:08:48 +0000 (21:08 +0800)]
bug fixed of GEMM node in ONNX_importer
Wanli [Wed, 22 Jun 2022 11:21:16 +0000 (19:21 +0800)]
Merge pull request #22100 from WanliZhong:issue_22015
Fix issue 22015, let Clip layer support 1-3 inputs
* Fix issue 22015.
Let layer Clip support 1-3 inputs.
* Resolve other problems caused by modifications
* Update onnx_importer.cpp
added extra checks to min/max handling in Clip
* Add assertions to check the size of the input
* Add test for clip with min and max initializers
* Separate test for "clip_init_min_max". Change the check method for input_size to provide a clearer message in case of problem.
* Add tests for clip with min or max initializers
* Change the implementation of getting input
Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Alexander Alekhin [Wed, 22 Jun 2022 08:56:47 +0000 (08:56 +0000)]
Merge pull request #22122 from zihaomu:gemm_onnx_bug_fix
Zihao Mu [Wed, 22 Jun 2022 07:00:17 +0000 (15:00 +0800)]
bug fixed of GEMM node in ONNX_importer
Kumataro [Mon, 20 Jun 2022 18:42:50 +0000 (03:42 +0900)]
Merge pull request #22064 from Kumataro:3.4-fix22052
* imgcodecs: jpeg: add IMWRITE_JPEG_SAMPLING_FACTOR parameter
* fix compile error
* imgcodecs: jpeg: add CV_LOG_WARNING() and fix how to initilize Mat
* imgcodecs: jpeg: fix for C++98 mode.
* samples: imgcodec_jpeg: Remove license
Alexander Alekhin [Sun, 19 Jun 2022 10:52:52 +0000 (10:52 +0000)]
Merge pull request #22127 from catree:update_homography_tutorial
Alexander Alekhin [Sun, 19 Jun 2022 10:51:36 +0000 (10:51 +0000)]
Merge pull request #22124 from vrabaud:3.4_sanitizer
catree [Sat, 18 Jun 2022 23:27:32 +0000 (01:27 +0200)]
Add more references. Update missing references with webarchive. Use mathbf for matrices. Check that the determinant of the rotation matrix is not negative (reflection), and correct it if it is the case.
Christine Poerschke [Fri, 17 Jun 2022 11:48:30 +0000 (12:48 +0100)]
Merge pull request #22065 from cpoerschke:3.4-apps-visualisation-configurable-codec
* apps/opencv_visualisation: configurable video codec
* Update apps/visualisation/opencv_visualisation.cpp
Vincent Rabaud [Fri, 17 Jun 2022 09:39:50 +0000 (11:39 +0200)]
Fix typo that prevents compilation with sanitizer.
Alexander Alekhin [Thu, 16 Jun 2022 11:04:50 +0000 (11:04 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 15 Jun 2022 18:32:26 +0000 (18:32 +0000)]
Merge pull request #22103 from fengyuentau:macOS_workflows_for_3.4
fengyuentau [Wed, 15 Jun 2022 10:25:35 +0000 (18:25 +0800)]
re-commit: add workflows for macOS for 3.4
Alexander Alekhin [Wed, 15 Jun 2022 07:54:38 +0000 (07:54 +0000)]
Merge pull request #22104 from fengyuentau:macOS_workflows_for_4.x
fengyuentau [Wed, 15 Jun 2022 03:02:07 +0000 (11:02 +0800)]
add workflows for macOS for 4.x
Alexander Alekhin [Tue, 14 Jun 2022 21:35:08 +0000 (21:35 +0000)]
Merge pull request #22091 from mukai1011:3.4
Alexander Alekhin [Mon, 13 Jun 2022 18:17:24 +0000 (18:17 +0000)]
Merge pull request #22080 from vrabaud:fix_arm
Alexander Alekhin [Mon, 13 Jun 2022 18:17:08 +0000 (18:17 +0000)]
Merge pull request #22089 from tailsu:sd/fix-displaymatrix-orientation
Vincent Rabaud [Wed, 8 Jun 2022 14:29:47 +0000 (16:29 +0200)]
Fix compilation on some ARM architecture.
This condition is the same as the line above.
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
Kôtaro Mukai [Sat, 11 Jun 2022 09:42:30 +0000 (18:42 +0900)]
Missing import
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 [Sun, 5 Jun 2022 15:16:54 +0000 (15:16 +0000)]
Merge tag '3.4.18'
Alexander Alekhin [Sun, 5 Jun 2022 07:52:44 +0000 (07:52 +0000)]
release: OpenCV 3.4.18
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