Alexander Alekhin [Wed, 22 Dec 2021 15:54:58 +0000 (15:54 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 22 Dec 2021 15:53:43 +0000 (15:53 +0000)]
Merge pull request #21314 from alalek:fix_links_4.x
Alexander Alekhin [Wed, 22 Dec 2021 15:53:02 +0000 (15:53 +0000)]
Merge pull request #21313 from alalek:fix_links_3.4
Alexander Alekhin [Wed, 22 Dec 2021 13:01:26 +0000 (13:01 +0000)]
fix 4.x links
Alexander Alekhin [Wed, 22 Dec 2021 12:38:21 +0000 (12:38 +0000)]
fix 3.4 links
dwardor [Wed, 22 Dec 2021 12:00:00 +0000 (13:00 +0100)]
Merge pull request #21114 from dwardor:patch-1
* Fix compile against lapack-3.10.0
Fix compilation against lapack >= 3.9.1 and 3.10.0 while not breaking older versions
OpenCVFindLAPACK.cmake & CMakeLists.txt: determine OPENCV_USE_LAPACK_PREFIX from LAPACK_VERSION
hal_internal.cpp : Only apply LAPACK_FUNC to functions whose number of inputs depends on LAPACK_FORTRAN_STR_LEN in lapack >= 3.9.1
lapack_check.cpp : remove LAPACK_FUNC which is not OK as function are not used with input parameters (so lapack.h preprocessing of "LAPACK_xxxx(...)" is not applicable with lapack >= 3.9.1
If not removed lapack_check fails so LAPACK is deactivated in build (not want we want)
use OCV_ prefix and don't use Global, instead generate OCV_LAPACK_FUNC depending on CMake Conditions
Remove CONFIG from find_package(LAPACK) and use LAPACK_GLOBAL and LAPACK_NAME to figure out if using netlib's reference LAPACK implementation and how to #define OCV_LAPACK_FUNC(f)
* Fix typos and grammar in comments
Alexander Alekhin [Tue, 21 Dec 2021 18:42:58 +0000 (18:42 +0000)]
Merge pull request #21303 from alalek:issue_21299_4.x
Alexander Alekhin [Tue, 21 Dec 2021 18:39:52 +0000 (18:39 +0000)]
Merge pull request #21302 from alalek:issue_21299_3.4
Alexander Alekhin [Tue, 21 Dec 2021 18:37:40 +0000 (18:37 +0000)]
Merge pull request #21305 from alalek:cmake_plugins_lowercase_internal_names
Alexander Alekhin [Tue, 21 Dec 2021 16:39:04 +0000 (16:39 +0000)]
Merge pull request #21301 from alalek:coverity_fixes_4.x
Alexander Alekhin [Tue, 21 Dec 2021 16:34:48 +0000 (16:34 +0000)]
cmake: force lowercase plugins internal names
Alexander Alekhin [Tue, 21 Dec 2021 15:51:22 +0000 (15:51 +0000)]
highgui: fix Win32 with OPENGL=ON
Alexander Alekhin [Tue, 21 Dec 2021 15:48:40 +0000 (15:48 +0000)]
Merge pull request #21297 from rogday:div_fix
Alexander Alekhin [Tue, 21 Dec 2021 15:44:59 +0000 (15:44 +0000)]
highgui: fix Win32 with OPENGL=ON
Alexander Alekhin [Tue, 21 Dec 2021 14:32:19 +0000 (14:32 +0000)]
videoio: add non zero check
Alexander Alekhin [Mon, 20 Dec 2021 18:11:54 +0000 (18:11 +0000)]
Merge pull request #21296 from alalek:update_ffmpeg_4.x
Alexander Alekhin [Mon, 20 Dec 2021 18:11:41 +0000 (18:11 +0000)]
Merge pull request #21295 from alalek:update_ffmpeg_3.4
rogday [Mon, 20 Dec 2021 16:53:37 +0000 (19:53 +0300)]
fix const/x in Div
Alexander Alekhin [Mon, 20 Dec 2021 16:30:21 +0000 (16:30 +0000)]
ffmpeg/4.x: update FFmpeg wrapper 2021.12
- FFmpeg 4.4.1
Alexander Alekhin [Mon, 20 Dec 2021 15:32:05 +0000 (15:32 +0000)]
ffmpeg/3.4: update FFmpeg wrapper 2021.12
- FFmpeg 3.4.9
Alexander Alekhin [Mon, 20 Dec 2021 15:03:21 +0000 (15:03 +0000)]
videoio: fix ffmpeg standalone build
Alexander Alekhin [Mon, 20 Dec 2021 13:13:58 +0000 (13:13 +0000)]
Merge pull request #21294 from mshabunin:fix-gst-audio
Maksim Shabunin [Mon, 20 Dec 2021 10:25:08 +0000 (13:25 +0300)]
videoio: added gst-audio dependency
Alexander Alekhin [Sat, 18 Dec 2021 13:53:46 +0000 (13:53 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 18 Dec 2021 13:46:38 +0000 (13:46 +0000)]
Merge pull request #21281 from alalek:update_version_4.5.5-pre
Alexander Alekhin [Sat, 18 Dec 2021 13:46:29 +0000 (13:46 +0000)]
Merge pull request #21280 from alalek:update_version_3.4.17-pre
Alexander Alekhin [Sat, 18 Dec 2021 13:41:48 +0000 (13:41 +0000)]
Merge pull request #21190 from rogday:acts
Smirnov Egor [Fri, 3 Dec 2021 20:17:07 +0000 (23:17 +0300)]
add celu, hardsigmoid, selu, thresholdedrelu layers
Alexander Alekhin [Fri, 17 Dec 2021 19:41:02 +0000 (19:41 +0000)]
Merge pull request #21279 from cabelo:new-example-intelrealsense
Alexander Alekhin [Fri, 17 Dec 2021 19:40:19 +0000 (19:40 +0000)]
Merge pull request #21253 from cabelo:allRrealsense
Alexander Alekhin [Fri, 17 Dec 2021 19:39:35 +0000 (19:39 +0000)]
Merge pull request #21282 from alalek:dnn_test_vulkan_skip
Stefano Allegretti [Fri, 17 Dec 2021 19:36:57 +0000 (20:36 +0100)]
Merge pull request #21275 from stal12:CCL_improvements
Improve CCL with new algorithms and tests
* Improve CCL with new algorithms and tests
* Split CCL test into dedicated tests cases
Alexander Alekhin [Fri, 17 Dec 2021 19:35:13 +0000 (19:35 +0000)]
Merge pull request #21176 from rogday:eltwise_layers
Smirnov Egor [Thu, 2 Dec 2021 12:45:27 +0000 (15:45 +0300)]
Add acos, acosh, asin, asinh, atan, atanh, cos, cosh, erf, hardswish, sin, sinh, softplus, softsign, tan layers
Alexander Alekhin [Fri, 17 Dec 2021 14:27:40 +0000 (14:27 +0000)]
Merge pull request #21283 from rogday:flatten_fix
Alexander Alekhin [Fri, 17 Dec 2021 13:28:34 +0000 (13:28 +0000)]
dnn(test): skip failed tests on Vulkan backend
Trutnev Aleksei [Fri, 17 Dec 2021 13:42:47 +0000 (16:42 +0300)]
Merge pull request #21231 from alexgiving:atrutnev/SIMD_SubRC_fluid
GAPI FLUID: SIMD for SubRC kernel
* SIMD for SubRC
* Reverse subrc
eplankin [Fri, 17 Dec 2021 13:31:37 +0000 (16:31 +0300)]
Merge pull request #21258 from eplankin:fix_threshold_to_zero_ipp_bug
Fixed threshold(THRESH_TOZERO) at imgproc(IPP)
* Fixed #16085: imgproc(IPP): wrong result from threshold(THRESH_TOZERO)
* 1. Added test cases with float where all bits of mantissa equal 1, min and max float as inputs
2. Used nextafterf instead of cast to hex
* Used float value in test instead of hex and casts
* Changed input value in test
Smirnov Egor [Thu, 16 Dec 2021 19:41:47 +0000 (22:41 +0300)]
fix Flatten layer
Alexander Alekhin [Fri, 17 Dec 2021 10:12:11 +0000 (10:12 +0000)]
pre: OpenCV 4.5.5 (version++)
Alexander Alekhin [Fri, 17 Dec 2021 10:05:52 +0000 (10:05 +0000)]
pre: OpenCV 3.4.17 (version++)
Maxim Milashchenko [Thu, 16 Dec 2021 19:43:02 +0000 (22:43 +0300)]
Merge pull request #21264 from MaximMilashchenko:AudioGStreamer
Audio GStreamer: added support .wav .flac audio formats
* added support .wav, lossless compressed audio formats
* fixed docs
* fixes
* videoio(gstreamer-audio): extra tests, improve error handling
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Thu, 16 Dec 2021 18:52:22 +0000 (18:52 +0000)]
Merge pull request #21277 from alalek:backport_21267
Alexander Alekhin [Thu, 16 Dec 2021 18:51:47 +0000 (18:51 +0000)]
Merge pull request #21267 from mshabunin:fix-kw-2021-12
alessandro faria [Thu, 16 Dec 2021 18:07:53 +0000 (15:07 -0300)]
New example for realsense
Gruhuang [Thu, 16 Dec 2021 17:06:02 +0000 (01:06 +0800)]
Merge pull request #21268 from pccvlab:tf_Arg
add argmax and argmin parsing for tensorflow
* add argmax and argmin for tf
* remove whitespace
* remove whitespace
* remove static_cast
Signed-off-by: Crayon-new <1349159541@qq.com>
Maksim Shabunin [Wed, 15 Dec 2021 09:49:13 +0000 (12:49 +0300)]
(3.4) Fixed several issues found by static analysis
original commit:
a079c2eb7cb74b4520c69b6f6c2ea79c7d410871
Maksim Shabunin [Wed, 15 Dec 2021 09:49:13 +0000 (12:49 +0300)]
Fixed several issues found by static analysis
Alexander Alekhin [Thu, 16 Dec 2021 16:05:49 +0000 (16:05 +0000)]
Merge pull request #21265 from alalek:dnn_onnx_test_filter_update_4.x
Alexander Alekhin [Wed, 15 Dec 2021 20:46:28 +0000 (20:46 +0000)]
dnn(test): update ONNX conformance filters (4.x)
Alexander Alekhin [Thu, 16 Dec 2021 11:19:53 +0000 (11:19 +0000)]
Merge pull request #21271 from vrabaud:3.4_clip
Vincent Rabaud [Thu, 16 Dec 2021 10:27:37 +0000 (11:27 +0100)]
Use NaN-safe clip function.
This is to prevent more NaN to int conversions like in #21111.
Alexander Alekhin [Thu, 16 Dec 2021 09:17:51 +0000 (09:17 +0000)]
Merge pull request #21269 from mshabunin:fix-hardening-o3
Maksim Shabunin [Thu, 16 Dec 2021 08:40:42 +0000 (11:40 +0300)]
Do not force -O2 flag in hardening-enabled builds
Alexander Alekhin [Wed, 15 Dec 2021 16:27:21 +0000 (16:27 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 15 Dec 2021 16:24:03 +0000 (16:24 +0000)]
Merge pull request #21261 from alalek:dnn_onnx_test_filter_update
Alexander Alekhin [Wed, 15 Dec 2021 08:57:50 +0000 (08:57 +0000)]
dnn(test): update ONNX conformance filters
Alexander Alekhin [Wed, 15 Dec 2021 12:02:20 +0000 (12:02 +0000)]
Merge pull request #21246 from pccvlab:square
Alexander Alekhin [Wed, 15 Dec 2021 10:26:49 +0000 (10:26 +0000)]
Merge pull request #21259 from rogday:random_fixes
Alexander Alekhin [Wed, 15 Dec 2021 08:17:09 +0000 (08:17 +0000)]
Merge pull request #21254 from alalek:build_opencv_winpack_dldt_2021.4.2
Smirnov Egor [Tue, 14 Dec 2021 17:54:43 +0000 (20:54 +0300)]
fix max_unpool missing attributes, add default value of keepdims in reducemean/max/sum, add support for keepdims=true in full reduction branch, add new padding type to Pad
Sinitsina Maria [Tue, 14 Dec 2021 17:33:26 +0000 (20:33 +0300)]
Merge pull request #20934 from SinM9:spectrogram_samples
AudioIO: add spectrogram samples for C++/python
Alexander Alekhin [Tue, 14 Dec 2021 16:59:07 +0000 (16:59 +0000)]
Merge pull request #21257 from alalek:imgproc_cvtcolor_lab_fix_nan
Alexander Alekhin [Tue, 14 Dec 2021 16:58:52 +0000 (16:58 +0000)]
Merge pull request #21256 from zchrissirhcz:fix-3.4-pyramid-tutorial
rogday [Tue, 14 Dec 2021 16:58:06 +0000 (19:58 +0300)]
Merge pull request #21088 from rogday:onnx_tests
Onnx conformance tests
* Add ONNX conformance tests
* dnn(test): add filters for ONNX conformance tests
* add filter lists for OCV backend
* address review comments
* move test_clip_inbounds to all_denylist
* address clip issue
* avoid empty lists
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Sat, 11 Dec 2021 17:28:21 +0000 (17:28 +0000)]
imgproc: catch NaNs in clip(), use table index debug check
- no NaN propagation guarantee
Trutnev Aleksei [Tue, 14 Dec 2021 15:16:59 +0000 (18:16 +0300)]
Merge pull request #21150 from alexgiving:atrutnev/fluid_perf
GAPI: Add compare function to perf tests
* Add PhasePerfTest and SqrtPerfTest
* rebasing
* debug tests
* remove spaces
* Disable DivRCPerfTestGPU
* rebase
* Applied comments
* Correction
* Revert parameter changes
Alexander Alekhin [Tue, 14 Dec 2021 15:15:07 +0000 (15:15 +0000)]
Merge pull request #21251 from vrabaud:3.4_bayer
Zhuo Zhang [Tue, 14 Dec 2021 13:06:02 +0000 (21:06 +0800)]
docs: correct normalize factor in gaussian pyramid tutorial
Alexander Alekhin [Mon, 13 Dec 2021 19:10:02 +0000 (19:10 +0000)]
build: winpack_dldt with dldt 2021.4.2
alessandro faria [Tue, 14 Dec 2021 06:21:31 +0000 (03:21 -0300)]
Illustration about realsense
Vincent Rabaud [Mon, 13 Dec 2021 22:43:49 +0000 (23:43 +0100)]
Fix harmless signed integer overflow.
When computing:
t1 = (bayer[1] + bayer[bayer_step] + bayer[bayer_step+2] + bayer[bayer_step*2+1])*G2Y;
there is a T (unsigned short or char) multiplied by an int which can overflow.
Then again, it is stored to t1 which is unsigned so the overflow disappears.
Keeping all unsigned is safer.
Alexander Alekhin [Mon, 13 Dec 2021 22:24:33 +0000 (22:24 +0000)]
Merge pull request #21250 from alalek:videoio_msmf_update_camera_3.4
Alexander Alekhin [Mon, 6 Dec 2021 06:54:48 +0000 (09:54 +0300)]
videoio(MSMF): add queue for async ReadSample()
Alexander Alekhin [Mon, 13 Dec 2021 20:38:14 +0000 (20:38 +0000)]
Merge pull request #21202 from alalek:videoio_msmf_update_camera
Alexander Alekhin [Mon, 13 Dec 2021 19:00:58 +0000 (19:00 +0000)]
Merge pull request #21178 from alalek:cmake_fix_soversion
Alexander Alekhin [Mon, 13 Dec 2021 18:03:50 +0000 (18:03 +0000)]
Merge pull request #21204 from anna-khakimova:ak/move_simd_absdiffc
Alexander Alekhin [Mon, 13 Dec 2021 17:16:03 +0000 (17:16 +0000)]
Merge pull request #21247 from rogday:coverity_fix
Polina Smolnikova [Mon, 13 Dec 2021 17:12:49 +0000 (20:12 +0300)]
Merge pull request #21166 from rayonnant14:issue_21105
Fix intrinsics processing in case USAC parameters
* fixed USAC intrinsics processing
* change mat to matx33d, added test
rogday [Mon, 13 Dec 2021 15:41:23 +0000 (18:41 +0300)]
initialize members
cqn2219076254 [Mon, 13 Dec 2021 13:43:13 +0000 (21:43 +0800)]
add square layer
Alexander Alekhin [Sat, 11 Dec 2021 15:18:57 +0000 (15:18 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 11 Dec 2021 15:14:43 +0000 (15:14 +0000)]
Merge pull request #21235 from jonay2000:fix-docs
Jonathan Dönszelmann [Sat, 11 Dec 2021 07:03:10 +0000 (08:03 +0100)]
Update name from Gunner to Gunnar as that's the name he published his
paper under.
Alexander Alekhin [Thu, 2 Dec 2021 13:32:59 +0000 (13:32 +0000)]
cmake: update SOVERSION
- OpenCV 4.x doesn't guarantee or maintain ABI compatibility
- We should increase SO version on each release
Alexander Alekhin [Fri, 10 Dec 2021 16:11:06 +0000 (16:11 +0000)]
Merge pull request #21193 from alalek:imgproc_test_bitexact_cvtcolor_yuv
Alexander Alekhin [Fri, 10 Dec 2021 16:07:57 +0000 (16:07 +0000)]
Merge pull request #21228 from alalek:issue_21198
Alexander Alekhin [Fri, 10 Dec 2021 16:04:01 +0000 (16:04 +0000)]
Merge pull request #21161 from rogday:elu_alpha_4x
HAN Liutong [Fri, 10 Dec 2021 16:03:22 +0000 (00:03 +0800)]
Merge pull request #21086 from hanliutong:rvv-dnn
Further optimize DNN for RISC-V Vector.
* Optimize DNN on RVV by using vsetvl.
* Rename vl.
* Update fastConv by using setvl instead of mask.
* Fix fastDepthwiseConv
Alexander Alekhin [Mon, 6 Dec 2021 06:54:48 +0000 (09:54 +0300)]
videoio(MSMF): add queue for async ReadSample()
Alexander Alekhin [Fri, 10 Dec 2021 14:12:01 +0000 (14:12 +0000)]
Merge pull request #21222 from asenyaev:asen/replace_distutils_copy_tree
Gruhuang [Fri, 10 Dec 2021 11:44:27 +0000 (19:44 +0800)]
Merge pull request #21154 from pccvlab:MatMul_with_two_inputs
Add BatchMatMul layer support for tf_importer
* two inputs
* support batch_matmul
* refactor: remove useless code
* refactor: decrease nesting
Simon Wilson [Fri, 10 Dec 2021 11:36:14 +0000 (22:36 +1100)]
Merge pull request #21227 from sbwilson:fix_framework_unicode_headers
* fix unicode errors for framework headers
This would crash if the header file included non-ASCII characters. This change ensures that headers are read and written as UTF-8 encoded files instead of ascii.
* Adds spaces after commas
Alexander Alekhin [Fri, 10 Dec 2021 11:33:17 +0000 (11:33 +0000)]
Merge pull request #21194 from whalenpt:qt_opengl_build_fix
Alexander Alekhin [Fri, 10 Dec 2021 11:32:03 +0000 (11:32 +0000)]
Merge pull request #21074 from vrabaud:3.4_rect
Sergey Ivanov [Fri, 10 Dec 2021 08:58:59 +0000 (11:58 +0300)]
Merge pull request #21230 from sivanov-work:gapi_win32_vpl_fix
G-API: Fix Win32 build: uint64_t ->size_t
* Fix Win32 build: uint64_t ->size_t
* Fix for MAC
Andrey Senyaev [Fri, 10 Dec 2021 08:46:27 +0000 (11:46 +0300)]
Replaced distutils to shutil when copying files in a tree
Patrick Whalen [Thu, 2 Dec 2021 19:10:30 +0000 (11:10 -0800)]
Fix broken build for Qt6 with options: WITH_QT=ON and WITH_OPENGL=ON
- QGLWidget changed to QOpenGLWidget in window_QT.h for Qt6 using
typedef OpenCVQtWidgetBase for handling Qt version
- Implement Qt6/OpenGL functionality in window_QT.cpp
- Swap QGLWidget:: function calls for OpenCVQtWidgetBase:: function calls
- QGLWidget::updateGL deprecated, swap to QOpenGLWidget::update for Qt6
- Add preprocessor definition to detect Qt6 -- HAVE_QT6
- Add OpenGLWidgets to qdeps list in highgui CMakeLists.txt
- find_package CMake command added for locating Qt module OpenGLWidgets
- Added check that Qt6::OpenGLWidgets component is found. Shut off Qt-openGL functionality if not found.
Alexander Alekhin [Thu, 9 Dec 2021 20:23:35 +0000 (20:23 +0000)]
imgproc(ocl): fix resizeLN, avoid integer overflow
UncleLLD [Thu, 9 Dec 2021 19:11:05 +0000 (03:11 +0800)]
Merge pull request #21224 from UncleLLD:fix-cvtColor-error
fix cvtColor-error
* fix gray image channel error
* fix gray image channel error
* fix cvtColor error after the video end
* fix cvtColor error after the video end and change next variable
* fix cvtColor error after the video end
* reset next variable
* fix cvtColor error after the video end
* fix cvtColor error after the video end