Alexander Alekhin [Fri, 15 Oct 2021 13:35:03 +0000 (13:35 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Nicholas Ho [Fri, 15 Oct 2021 11:47:53 +0000 (12:47 +0100)]
Merge pull request #20740 from Nicholas-Ho-arm:3.4_SymmColumnVec_32f8u
* Add SymmColumnVec_32f8u
* Fix double to float warnings
Alexander Alekhin [Thu, 14 Oct 2021 16:11:37 +0000 (16:11 +0000)]
Merge pull request #20868 from icestraw:fix-type-error-of-slice-indices
icestraw [Wed, 13 Oct 2021 14:35:29 +0000 (22:35 +0800)]
fix type error of slice indices
Alexander Alekhin [Wed, 13 Oct 2021 17:08:58 +0000 (17:08 +0000)]
Merge pull request #20867 from alalek:fix_CV_POPCNT_U64_msvs
Alexander Alekhin [Wed, 13 Oct 2021 14:21:08 +0000 (14:21 +0000)]
Merge pull request #20834 from sthalik:msvc-shared-library-static-crt
Alexander Alekhin [Wed, 13 Oct 2021 01:14:37 +0000 (01:14 +0000)]
core: ensure 'int' result from CV_POPCNT_U64(x)
Stanislaw Halik [Mon, 4 Oct 2021 12:42:51 +0000 (14:42 +0200)]
fix link error on shared libs with -MT
Alexander Alekhin [Tue, 12 Oct 2021 15:36:32 +0000 (15:36 +0000)]
Merge pull request #20860 from rogday:sum_fix
Alexander Alekhin [Mon, 11 Oct 2021 18:51:46 +0000 (18:51 +0000)]
Merge pull request #20859 from rogday:sub_const_fix
Smirnov Egor [Mon, 11 Oct 2021 17:59:44 +0000 (20:59 +0300)]
change asserts for Sum
Smirnov Egor [Mon, 11 Oct 2021 15:58:10 +0000 (18:58 +0300)]
fix const - input and remove unimplemented function
Alexander Alekhin [Sun, 10 Oct 2021 00:22:46 +0000 (00:22 +0000)]
Merge tag '4.5.4'
Alexander Alekhin [Sat, 9 Oct 2021 15:48:26 +0000 (15:48 +0000)]
release: OpenCV 4.5.4
Alexander Alekhin [Sat, 9 Oct 2021 15:45:17 +0000 (15:45 +0000)]
Merge pull request #20848 from alalek:reverse_plugins_candidates_order
Yaniv Hollander [Sat, 9 Oct 2021 15:43:50 +0000 (11:43 -0400)]
Merge pull request #20721 from YanivHollander:DocFixes
Doc fixes
* Update imgproc.hpp
* Update imgproc.hpp
Alexander Alekhin [Sat, 9 Oct 2021 06:22:02 +0000 (06:22 +0000)]
Merge pull request #20846 from alalek:issue_19947
Alexander Alekhin [Sat, 9 Oct 2021 05:59:24 +0000 (05:59 +0000)]
Merge pull request #20847 from alalek:fix_build_js_simd_tests
Alexander Alekhin [Fri, 8 Oct 2021 20:34:07 +0000 (20:34 +0000)]
plugins: reverse candidates order to fetch higher versions first
Alexander Alekhin [Fri, 8 Oct 2021 20:09:43 +0000 (20:09 +0000)]
js: fix build of SIMD tests
Alexander Alekhin [Fri, 8 Oct 2021 19:47:07 +0000 (19:47 +0000)]
highgui(docs): we don't support 32-bit integer images in imshow()
Yuantao Feng [Fri, 8 Oct 2021 19:13:49 +0000 (03:13 +0800)]
Merge pull request #20422 from fengyuentau:dnn_face
Add DNN-based face detection and face recognition into modules/objdetect
* Add DNN-based face detector impl and interface
* Add a sample for DNN-based face detector
* add recog
* add notes
* move samples from samples/cpp to samples/dnn
* add documentation for dnn_face
* add set/get methods for input size, nms & score threshold and topk
* remove the DNN prefix from the face detector and face recognizer
* remove default values in the constructor of impl
* regenerate priors after setting input size
* two filenames for readnet
* Update face.hpp
* Update face_recognize.cpp
* Update face_match.cpp
* Update face.hpp
* Update face_recognize.cpp
* Update face_match.cpp
* Update face_recognize.cpp
* Update dnn_face.markdown
* Update dnn_face.markdown
* Update face.hpp
* Update dnn_face.markdown
* add regression test for face detection
* remove underscore prefix; fix warnings
* add reference & acknowledgement for face detection
* Update dnn_face.markdown
* Update dnn_face.markdown
* Update ts.hpp
* Update test_face.cpp
* Update face_match.cpp
* fix a compile error for python interface; add python examples for face detection and recognition
* Major changes for Vadim's comments:
* Replace class name FaceDetector with FaceDetectorYN in related failes
* Declare local mat before loop in modules/objdetect/src/face_detect.cpp
* Make input image and save flag optional in samples/dnn/face_detect(.cpp, .py)
* Add camera support in samples/dnn/face_detect(.cpp, .py)
* correct file paths for regression test
* fix convertion warnings; remove extra spaces
* update face_recog
* Update dnn_face.markdown
* Fix warnings and errors for the default CI reports:
* Remove trailing white spaces and extra new lines.
* Fix convertion warnings for windows and iOS.
* Add braces around initialization of subobjects.
* Fix warnings and errors for the default CI systems:
* Add prefix 'FR_' for each value name in enum DisType to solve the
redefinition error for iOS compilation; Modify other code accordingly
* Add bookmark '#tutorial_dnn_face' to solve warnings from doxygen
* Correct documentations to solve warnings from doxygen
* update FaceRecognizerSF
* Fix the error for CI to find ONNX models correctly
* add suffix f to float assignments
* add backend & target options for initializing face recognizer
* add checkeq for checking input size and preset size
* update test and threshold
* changes in response to alalek's comments:
* fix typos in samples/dnn/face_match.py
* import numpy before importing cv2
* add documentation to .setInputSize()
* remove extra include in face_recognize.cpp
* fix some bugs
* Update dnn_face.markdown
* update thresholds; remove useless code
* add time suffix to YuNet filename in test
* objdetect: update test code
Alexander Alekhin [Fri, 8 Oct 2021 19:12:43 +0000 (19:12 +0000)]
Merge pull request #20818 from rogday:yolov4x_mish_cuda
Alexander Alekhin [Fri, 8 Oct 2021 19:05:00 +0000 (19:05 +0000)]
Merge tag '3.4.16'
Alexander Alekhin [Fri, 8 Oct 2021 18:31:56 +0000 (18:31 +0000)]
release: OpenCV 3.4.16
Smirnov Egor [Wed, 6 Oct 2021 13:09:20 +0000 (16:09 +0300)]
backport YOLOv4x-mish new_coords CUDA implementation
Alexander Alekhin [Fri, 8 Oct 2021 11:05:45 +0000 (11:05 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 8 Oct 2021 07:01:05 +0000 (07:01 +0000)]
Merge pull request #20841 from alalek:core_keep_TlsAbstraction_singleton_3.4
Alexander Alekhin [Fri, 8 Oct 2021 06:29:41 +0000 (09:29 +0300)]
Merge pull request #20842 from alalek:valgrind_suppression
Alexander Alekhin [Fri, 8 Oct 2021 05:07:51 +0000 (05:07 +0000)]
Merge pull request #20840 from alalek:dnn_ocl_cleanup_code
Alexander Alekhin [Fri, 8 Oct 2021 01:36:58 +0000 (04:36 +0300)]
core(tls): avoid destruction of TlsAbstraction singleton
Alexander Alekhin [Fri, 8 Oct 2021 02:19:54 +0000 (02:19 +0000)]
Merge pull request #20839 from alalek:issue_20828_netbsd
Alexander Alekhin [Fri, 8 Oct 2021 02:09:46 +0000 (02:09 +0000)]
Merge pull request #20838 from alalek:fix_20833
Alexander Alekhin [Fri, 8 Oct 2021 02:08:26 +0000 (02:08 +0000)]
Merge pull request #20837 from alalek:fixup_20825
Jonas Vautherin [Fri, 8 Oct 2021 02:07:04 +0000 (04:07 +0200)]
Merge pull request #20801 from JonasVautherin:fix-gst-error-handling
* Fix gst error handling
* Use the return value instead of the error, which gives no guarantee of being NULL in case of error
* Test err pointer before accessing it
* Remove unreachable code
* videoio(gstreamer): restore check in writer code
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Thu, 7 Oct 2021 15:32:18 +0000 (15:32 +0000)]
core: fix compilation of copy ctors/assignment operators with GCC 4.x
Alexander Alekhin [Fri, 8 Oct 2021 00:12:14 +0000 (00:12 +0000)]
dnn(ocl4dnn): cleanup dead code, improve logging
Alexander Alekhin [Thu, 7 Oct 2021 23:27:10 +0000 (23:27 +0000)]
core: add __NetBSD__ build fix in parallel.cpp
Alexander Alekhin [Thu, 7 Oct 2021 17:58:19 +0000 (17:58 +0000)]
dnn(ocl4dnn): add extra checks to convolution layer
- prevent running code over unsupported/non-tested configurations
- prevent integer div by zero
Alexander Panov [Thu, 7 Oct 2021 22:46:25 +0000 (01:46 +0300)]
Merge pull request #20823 from AleksandrPanov:fix_orb_integer_overflow
Fix ORB integer overflow
* set size_t step to fix integer overflow in ptr0 offset
* added issue_537 test
* minor fix tags, points
* added size_t_step and offset to remove mixed unsigned and signed operations
* features2d: update ORB checks
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Thu, 7 Oct 2021 16:43:19 +0000 (16:43 +0000)]
Merge pull request #20835 from sthalik:msvc-no-thread-support
Alexander Alekhin [Thu, 7 Oct 2021 16:16:59 +0000 (16:16 +0000)]
Merge pull request #20831 from sthalik:fix-msvc-build-3.4
Stanislaw Halik [Mon, 4 Oct 2021 12:42:08 +0000 (14:42 +0200)]
fix OPENCV_DISABLE_THREAD_SUPPORT
Message was,
CMake Error at CMakeLists.txt:1475 (message):
Not all parallel frameworks have been disabled (using Concurrency).
Stanislaw Halik [Mon, 4 Oct 2021 12:42:32 +0000 (14:42 +0200)]
add new supported MSVC version
Alexander Alekhin [Thu, 7 Oct 2021 04:27:22 +0000 (04:27 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 6 Oct 2021 22:50:09 +0000 (22:50 +0000)]
Merge pull request #20825 from alalek:issue_20718
Alexander Alekhin [Wed, 6 Oct 2021 22:47:31 +0000 (22:47 +0000)]
Merge pull request #20820 from alalek:issue_20514
Alexander Alekhin [Wed, 6 Oct 2021 22:46:58 +0000 (22:46 +0000)]
Merge pull request #20819 from alalek:issue_19567
Alexander Alekhin [Wed, 6 Oct 2021 22:46:21 +0000 (22:46 +0000)]
Merge pull request #20829 from alalek:dnn_ocl_skip_int8_tests
Alexander Alekhin [Wed, 6 Oct 2021 18:43:12 +0000 (18:43 +0000)]
core: ensure is_trivially_copyable for simple types
Alexander Alekhin [Wed, 6 Oct 2021 21:27:18 +0000 (21:27 +0000)]
dnn(ocl): skip int8 tests due to memory access issues
Alexander Alekhin [Wed, 6 Oct 2021 20:30:48 +0000 (20:30 +0000)]
Merge pull request #20826 from alalek:fix_20824
Alexander Alekhin [Wed, 6 Oct 2021 20:20:34 +0000 (20:20 +0000)]
Merge pull request #20813 from rogday:soft_nms
Alexander Alekhin [Wed, 6 Oct 2021 19:09:22 +0000 (19:09 +0000)]
highgui: repair Qt backend
Smirnov Egor [Tue, 5 Oct 2021 13:46:37 +0000 (16:46 +0300)]
add SoftNMS implementation
Alexander Alekhin [Wed, 6 Oct 2021 17:32:09 +0000 (17:32 +0000)]
Merge pull request #20817 from komakai:fix_old_xcode_build
Alexander Alekhin [Wed, 6 Oct 2021 17:25:32 +0000 (17:25 +0000)]
videoio: fix plugins handling if no filesystem available
Alexander Alekhin [Wed, 6 Oct 2021 16:49:02 +0000 (16:49 +0000)]
android: drop sourceCompatibility/targetCompatibility options
Oliver Kuckertz [Wed, 6 Oct 2021 16:41:05 +0000 (18:41 +0200)]
Merge pull request #20725 from mologie:fix-dnn-tf-on-arm
* dnn: fix unaligned memory access crash on armv7
The getTensorContent function would return a Mat pointing to some
member of a Protobuf-encoded message. Protobuf does not make any
alignment guarantees, which results in a crash on armv7 when loading
models while bit 2 is set in /proc/cpu/alignment (or the relevant
kernel feature for alignment compatibility is disabled). Any read
attempt from the previously unaligned data member would send SIGBUS.
As workaround, this commit makes an aligned copy via existing clone
functionality in getTensorContent. The unsafe copy=false option is
removed. Unfortunately, a rather crude hack in PReLUSubgraph in fact
writes(!) to the Protobuf message. We limit ourselves to fixing the
alignment issues in this commit, and add getTensorContentRefUnaligned
to cover the write case with a safe memcpy. A FIXME marks the issue.
* dnn: reduce amount of .clone() calls
* dnn: update FIXME comment
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Giles Payne [Wed, 6 Oct 2021 12:06:30 +0000 (21:06 +0900)]
Fix build on older Xcode versions
Alexander Alekhin [Wed, 6 Oct 2021 12:05:45 +0000 (15:05 +0300)]
Merge pull request #20815 from alalek:fix_20649_revert_19859
features2d: repair SimpleBlobDetector
* features2d: revert code change by PR #19859
Reverted commit
76860933f0a31c0abd1b26c1f11b25972cda031e
* features2d: check SimpleBlobDetector parameters consistency
Alexander Alekhin [Wed, 6 Oct 2021 12:02:34 +0000 (12:02 +0000)]
Merge pull request #20814 from alalek:dnn_pytest_input_3d
Alexander Alekhin [Wed, 6 Oct 2021 12:01:06 +0000 (12:01 +0000)]
Merge pull request #20802 from alalek:core_tls_init_TlsAbstraction
Alexander Alekhin [Tue, 5 Oct 2021 23:21:27 +0000 (23:21 +0000)]
dnn(pytest/test_input_3d): reload model between switching targets
Alexander Alekhin [Tue, 5 Oct 2021 15:35:58 +0000 (15:35 +0000)]
Merge pull request #20731 from komakai:matrix_mult_android_ios
HAN Liutong [Tue, 5 Oct 2021 15:35:00 +0000 (23:35 +0800)]
Merge pull request #20521 from hanliutong:dev-rvv-multiVLEN
Make the implementation of optimization in DNN adjustable to different vector sizes with RVV intrinsics.
* Update fastGEMM for multi VLEN.
* Update fastGEMM1T for multi VLEN.
* Update fastDepthwiseConv for multi VLEN.
* Update fastConv for multi VLEN.
* Replace malloc with cv::AutoBuffer.
Alexander Alekhin [Tue, 5 Oct 2021 15:06:25 +0000 (15:06 +0000)]
Merge pull request #20811 from alalek:update_ffmpeg_4.x
Alexander Alekhin [Tue, 5 Oct 2021 15:06:08 +0000 (15:06 +0000)]
Merge pull request #20808 from alalek:update_ffmpeg_3.4
Alexander Alekhin [Tue, 5 Oct 2021 11:38:10 +0000 (11:38 +0000)]
Merge pull request #20771 from smirnov-alexey:as/render_fixture_params
Alexander Alekhin [Tue, 5 Oct 2021 11:32:39 +0000 (14:32 +0300)]
ffmpeg/4.x: update FFmpeg wrapper 2021.10
- FFmpeg 4.4 (no changes)
Giles Payne [Tue, 5 Oct 2021 11:16:06 +0000 (20:16 +0900)]
Simple matrix multiplication for Mat in iOS/Android
Alexander Alekhin [Tue, 5 Oct 2021 10:45:12 +0000 (10:45 +0000)]
Merge pull request #20788 from alalek:update_version_4.5.4-pre
Alexander Alekhin [Tue, 5 Oct 2021 07:09:27 +0000 (10:09 +0300)]
ffmpeg/3.4: update FFmpeg wrapper 2021.10
- FFmpeg 3.4.8 (no changes)
Alexander Alekhin [Mon, 4 Oct 2021 22:50:26 +0000 (22:50 +0000)]
Merge pull request #20806 from alalek:update_version_3.4.16-pre
Alexander Alekhin [Mon, 4 Oct 2021 22:35:47 +0000 (22:35 +0000)]
pre: OpenCV 4.5.4 (version++)
Alexander Alekhin [Mon, 4 Oct 2021 22:35:00 +0000 (22:35 +0000)]
Merge pull request #20782 from YashasSamaga:cuda4dnn-eltwise-broadcast
Alexander Alekhin [Mon, 4 Oct 2021 20:47:07 +0000 (20:47 +0000)]
pre: OpenCV 3.4.16 (version++)
Alexander Alekhin [Mon, 4 Oct 2021 19:41:00 +0000 (19:41 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 4 Oct 2021 19:16:27 +0000 (19:16 +0000)]
Merge pull request #20803 from alalek:core_parallel_workaround_tsan
Shivanshu Tyagi [Mon, 4 Oct 2021 18:18:02 +0000 (23:48 +0530)]
Merge pull request #20291 from spazewalker:master
speech recognition sample
* speech recognition sample added.(initial commit)
* fixed typos, removed plt
* trailing whitespaces removed
* masking removed and using opencv for displaying spectrogram
* description added
* requested changes and add opencl fp16 target
* parenthesis and halide removed
* workaround 3d matrix issue
* handle multi channel audio
support for multiple files at once
* suggested changes
fix whitespaces
Jebastin Nadar [Mon, 4 Oct 2021 18:07:38 +0000 (23:37 +0530)]
Merge pull request #20535 from SamFC10:onnx-q
dnn : int8 quantized layers support in onnx importer
* added quantized layers support in onnx importer
* added more cases in eltwise node, some more checks
* added tests for quantized nodes
* relax thresholds for failed tests, address review comments
* refactoring based on review comments
* added support for unsupported cases and pre-quantized resnet50 test
* relax thresholds due to int8 resize layer
keroiber [Mon, 4 Oct 2021 16:51:49 +0000 (18:51 +0200)]
Merge pull request #20743 from keroiber:prefix_js_function_bindings_with_namespace
* Prefix global javascript functions with sub-namespaces
* js: handle 'namespace_prefix_override', update filtering
- avoid functions override with same name but different namespace
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
xhawk18 [Mon, 4 Oct 2021 16:44:57 +0000 (00:44 +0800)]
Merge pull request #20183 from xhawk18:3.4
* improve compatibility for qt 6.
* cmake(highgui): rework Qt dependency support
* cmake(highgui): workaround Qt5Config.cmake "components" bug
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Zihao Mu [Mon, 4 Oct 2021 16:37:38 +0000 (00:37 +0800)]
Merge pull request #20702 from zihaomu:tf_expand_dim_layer
Add ExpandDims layer of tf_importer.cpp
* Add ExpandDims to tf_importer.
* add -1 expand test case.
* Support different dimensions of input.
* Compatible with 5-dimensional NDHWC data
* Code align
* support 3-dim input.
* 3-dim bug fixed.
* fixing error of code format.
Alexander Alekhin [Mon, 4 Oct 2021 16:27:05 +0000 (16:27 +0000)]
valgrind: update suppressions
Alexander Alekhin [Mon, 4 Oct 2021 15:38:49 +0000 (15:38 +0000)]
Merge pull request #20772 from shengyu7697:remove-redundant-semicolon
Alexander Alekhin [Mon, 4 Oct 2021 09:40:16 +0000 (09:40 +0000)]
core(TLS): force TlsAbstraction initialization before main()
Alexander Alekhin [Mon, 4 Oct 2021 10:46:32 +0000 (10:46 +0000)]
core(parallel): suppress TSAN warning
YashasSamaga [Mon, 4 Oct 2021 07:08:45 +0000 (12:38 +0530)]
support broadcasting in eltwise ops
Alexander Alekhin [Sun, 3 Oct 2021 18:52:08 +0000 (18:52 +0000)]
Merge pull request #20800 from SamFC10:fix-int8-conv
SamFC10 [Sun, 3 Oct 2021 09:46:01 +0000 (15:16 +0530)]
fix illegal memory access in int8 convolution
Alexander Alekhin [Sat, 2 Oct 2021 17:57:18 +0000 (17:57 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 2 Oct 2021 17:50:38 +0000 (17:50 +0000)]
Merge pull request #20797 from sturkmen72:restore_LSD
Alexander Alekhin [Sat, 2 Oct 2021 17:48:23 +0000 (17:48 +0000)]
Merge pull request #20796 from JonasVautherin:patch-1
Jonas Vautherin [Sat, 2 Oct 2021 01:07:25 +0000 (03:07 +0200)]
Fix gst_initializer
Use the return value of gst_init_check instead of testing the error pointer
Alexander Alekhin [Sat, 2 Oct 2021 15:35:56 +0000 (15:35 +0000)]
Merge pull request #20795 from JBamberger:gradle-dynamic-cv-version
Jannik Bamberger [Fri, 1 Oct 2021 22:04:23 +0000 (00:04 +0200)]
Automatically set the correct OpenCV version in build.gradle
Automatically sets the correct OpenCV version in the CMAKE example contained in the build.gradle
file of the Android SDK.
Suleyman TURKMEN [Sat, 2 Oct 2021 10:32:11 +0000 (13:32 +0300)]
additional changes
shengyu [Wed, 29 Sep 2021 13:02:40 +0000 (21:02 +0800)]
remove redundant semicolons
Alexander Alekhin [Fri, 1 Oct 2021 22:25:47 +0000 (22:25 +0000)]
Merge pull request #20794 from alalek:dnn_ocl_fix_conv_dwconv_workgroup