Alexander Alekhin [Sat, 30 Oct 2021 14:26:17 +0000 (14:26 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 30 Oct 2021 14:01:33 +0000 (14:01 +0000)]
Merge pull request #20982 from alalek:highgui_drop_cvGetWindowImageRect_4.x
Alexander Alekhin [Sat, 30 Oct 2021 13:59:08 +0000 (13:59 +0000)]
Merge pull request #20980 from alalek:highgui_fix_cvGetWindowImageRect_3.4
Alexander Alekhin [Sat, 30 Oct 2021 10:57:47 +0000 (10:57 +0000)]
highgui: drop invalid cvGetWindowImageRect
Alexander Alekhin [Sat, 30 Oct 2021 10:51:52 +0000 (10:51 +0000)]
highgui: drop invalid cvGetWindowImageRect
- return type is C++ template
- removal from 'extern "C"' scope broke ABI anyway, so this symbols is removed completelly
Alexander Alekhin [Sat, 30 Oct 2021 10:27:32 +0000 (10:27 +0000)]
Merge pull request #20976 from alalek:issue_20968
Alexander Alekhin [Fri, 29 Oct 2021 16:08:57 +0000 (16:08 +0000)]
python: properly handle step for multichannel case
Alexander Alekhin [Fri, 29 Oct 2021 17:45:09 +0000 (17:45 +0000)]
Merge pull request #20971 from alalek:cmake_build_type_use_release
Trutnev Aleksei [Fri, 29 Oct 2021 16:30:35 +0000 (19:30 +0300)]
Merge pull request #20922 from alexgiving:atrutnev/align_expect_assert_macros
GAPI: Align EXPECT/ASSERT macros
* Align TEST macros
* restart CI
* Fix ASSERT_GT in gapi_async_test
Alexander Alekhin [Fri, 29 Oct 2021 15:19:34 +0000 (15:19 +0000)]
Merge pull request #20972 from Isydmr:correct-db-text-detector-drive-links
Alexander Alekhin [Thu, 28 Oct 2021 23:02:32 +0000 (02:02 +0300)]
cmake: use CMAKE_BUILD_TYPE=Release by default
Ihsan Soydemir [Fri, 29 Oct 2021 10:30:51 +0000 (13:30 +0300)]
Correct drive links for DB_IC15 and DB_TD500
Alexander Alekhin [Thu, 28 Oct 2021 23:00:48 +0000 (23:00 +0000)]
Merge pull request #20969 from alalek:fix_msvc_clang_warning_noreturn
Alexander Alekhin [Thu, 28 Oct 2021 22:27:41 +0000 (22:27 +0000)]
Merge pull request #20967 from alalek:fix_msvc_clang_unused_parameter
Alexander Alekhin [Thu, 28 Oct 2021 21:32:47 +0000 (21:32 +0000)]
core: eliminate Winvalid-noreturn in base.hpp
Alexander Alekhin [Thu, 28 Oct 2021 21:08:36 +0000 (21:08 +0000)]
build: fix MSVC-Clang warnings about unused parameters in stubs
Maxim Pashchenkov [Thu, 28 Oct 2021 18:19:46 +0000 (21:19 +0300)]
Merge pull request #20937 from mpashchenkov:mp/ocv-gapi-warnings
G-API: Disable Windows warnings with 4996 code
* Windows warnings 4503 and 4996 are disabled with dnn style
* Applying comments to review
* Reproducing
* Added check MSVC_VERSION for both warnings
Alexander Alekhin [Thu, 28 Oct 2021 13:54:23 +0000 (13:54 +0000)]
Merge pull request #20961 from alalek:fix_msvc_clang
Alexander Alekhin [Thu, 28 Oct 2021 13:54:07 +0000 (13:54 +0000)]
Merge pull request #20960 from alalek:fix_icc_support_3.4
Alexander Alekhin [Thu, 28 Oct 2021 11:25:00 +0000 (11:25 +0000)]
core(simd): fix compilation with MSVC-Clang
Alexander Alekhin [Thu, 28 Oct 2021 05:49:05 +0000 (05:49 +0000)]
build(icc): fix nodiscard attribute handling
Alexander Alekhin [Thu, 28 Oct 2021 05:20:23 +0000 (05:20 +0000)]
cmake: fix popcnt detection with Intel Compiler
Alexander Alekhin [Wed, 27 Oct 2021 20:09:51 +0000 (20:09 +0000)]
Merge pull request #20950 from Harvey-Huang:master
Alexander Alekhin [Wed, 27 Oct 2021 19:59:57 +0000 (19:59 +0000)]
Merge pull request #20958 from noahstier:3.4_tvl1_optimization
Alexander Alekhin [Wed, 27 Oct 2021 19:31:27 +0000 (19:31 +0000)]
Merge pull request #20954 from shengyu7697:remove-redundant-semicolon
Noah Stier [Wed, 27 Oct 2021 19:01:53 +0000 (12:01 -0700)]
tvl1 cuda optflow optimization
Chengrui Wang [Wed, 27 Oct 2021 12:23:42 +0000 (20:23 +0800)]
Merge pull request #20935 from crywang:dnn_face
Fix problems in tutorial and python sample of dnn_face.
* Update dnn_face.markdown
* Update face_match.py
shengyu [Wed, 27 Oct 2021 12:19:05 +0000 (20:19 +0800)]
remove redundant semicolons
Alexander Alekhin [Wed, 27 Oct 2021 09:17:15 +0000 (09:17 +0000)]
Merge pull request #20924 from alexgiving:atrutnev/fix_gkernel_documentation
Harvey [Wed, 27 Oct 2021 05:52:54 +0000 (13:52 +0800)]
fixed bug: opencv read tif file convert Palette color image as grayscale image
Alexander Alekhin [Tue, 26 Oct 2021 16:04:17 +0000 (16:04 +0000)]
Merge pull request #20947 from alalek:cmake_find_package_quiet
MaximMilashchenko [Tue, 26 Oct 2021 14:33:53 +0000 (17:33 +0300)]
Merge pull request #20942 from MaximMilashchenko:AudioPatch
Audio patch
* fixed microphone, audio position
* fixed docs
* changed AudioOpenCheck
Alexander Alekhin [Tue, 26 Oct 2021 14:29:57 +0000 (14:29 +0000)]
cmake: find_package with QUIET
Alexander Alekhin [Mon, 25 Oct 2021 18:17:13 +0000 (18:17 +0000)]
Merge pull request #20940 from alalek:cmake_fix_samples_parallel_backend
Alexander Alekhin [Mon, 18 Oct 2021 20:48:24 +0000 (20:48 +0000)]
samples: update parallel_backend examples
- use find_package(TBB)
Alexander Alekhin [Sat, 23 Oct 2021 15:33:31 +0000 (15:33 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 22 Oct 2021 14:08:08 +0000 (14:08 +0000)]
Merge pull request #20919 from berak:patch-1
Harvey [Fri, 22 Oct 2021 14:04:19 +0000 (22:04 +0800)]
Merge pull request #20875 from Harvey-Huang:master
* bmp specified BI_BITFIELDS should take care RGBA bit mask
* change the name
* support xrgb bmp file
* support xrgb bmp file(add test case)
* update testing code
berak [Thu, 21 Oct 2021 09:38:17 +0000 (11:38 +0200)]
resolves #20913
imgproc: remove asserts for circles_ in HoughCircles
atrutnev [Fri, 22 Oct 2021 08:06:09 +0000 (11:06 +0300)]
fix gkernel Doxygen documentation
Alexander Alekhin [Thu, 21 Oct 2021 16:26:53 +0000 (16:26 +0000)]
Merge pull request #20912 from AleksandrPanov:fix_findMinEnclosingTriangle
Sergey Ivanov [Thu, 21 Oct 2021 16:12:03 +0000 (19:12 +0300)]
Merge pull request #20921 from sivanov-work:atl_patch
G-API: FIX OpenVINO build - Add CComPtr RAII replacement into G-API sample
* Add CComPtr RAII replacement into G-API sample
* Remove completely `atlbase.h'
AleksandrPanov [Thu, 21 Oct 2021 15:12:51 +0000 (18:12 +0300)]
fix findMinEnclosingTriangle and add tests
Maksim Shabunin [Thu, 21 Oct 2021 13:56:11 +0000 (16:56 +0300)]
Merge pull request #20614 from mshabunin:use-onevpl-load
videoio: use oneVPL load mechanism, encoder bitrate estimation
* videoio: updated oneVPL support - use mfxLoad
* videoio: advanced bitrate estimation for MFX encoder
* videoio: improved MediaSDK/oneVPL/libva detection
* videoio(ffmpeg): don't try oneVPL
* videoio(test): tune checks of videoio_mfx.read_write_raw tests
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Thu, 21 Oct 2021 13:04:01 +0000 (13:04 +0000)]
Merge pull request #20903 from alalek:samples_fix_nothreads_build
Alexander Alekhin [Thu, 21 Oct 2021 13:03:46 +0000 (13:03 +0000)]
Merge pull request #20906 from alalek:backport_20903
Alexander Alekhin [Thu, 21 Oct 2021 11:45:48 +0000 (11:45 +0000)]
Merge pull request #20916 from Harvey-Huang:32bit_rgb
Alexander Alekhin [Thu, 21 Oct 2021 11:35:57 +0000 (11:35 +0000)]
Merge pull request #20920 from alalek:hotfix_clang_abi
Alexander Alekhin [Thu, 21 Oct 2021 09:36:25 +0000 (09:36 +0000)]
hotfix: repair Clang ABI
Harvey [Thu, 21 Oct 2021 08:47:27 +0000 (16:47 +0800)]
32bit rgb bmp file should not copy data as rgba
Alexander Alekhin [Thu, 21 Oct 2021 07:09:14 +0000 (07:09 +0000)]
Merge pull request #20908 from alalek:4.x_drop_legacy
Alexander Alekhin [Wed, 20 Oct 2021 17:00:38 +0000 (17:00 +0000)]
Merge pull request #20877 from rogday:simple_layers
MaximMilashchenko [Wed, 20 Oct 2021 13:18:24 +0000 (16:18 +0300)]
Merge pull request #19721 from MaximMilashchenko:Audio
add audio support in cap_msmf
* audio msmf
* fixed warnings
* minor fix
* fixed SampleTime MSMF
* minor fix, fixed audio test, retrieveAudioFrame
* fixed warnings
* impelemented sync audio and video stream with start offset
* fixed error
* fixed docs
* fixed audio sample
* CAP_PROP_AUDIO_POS, minor fixed
* fixed warnings
* videoio(MSMF): update audio test checks, add debug logging
* fixed
* fixed desynchronization of time positions, warnings
* fixed warnings
* videoio(audio): tune tests checks
* videoio(audio): update properties description
* build warnings
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Wed, 20 Oct 2021 09:48:20 +0000 (09:48 +0000)]
Merge pull request #20910 from lukasalexanderweber:sift_fix
Sergey Ivanov [Wed, 20 Oct 2021 09:43:32 +0000 (12:43 +0300)]
Merge pull request #20738 from sivanov-work:merge_master_vpl_dev_select
G-API: oneVPL - Implement IDeviceSelector & default cfg_param-based selector
* Initial commit
* Add MACRO undef
* Change IDeviceSelector, Change Inf sample for choose external device
* Fix compilation
* Address some comments
* Fix compilation
* Add missing header
* Add EXPORT to dev selector
* Add guard
* Remove enum type attr
* Fix compilation without VPL
* Add HAVE_INFER guard in sample
* Remove unusable include from tests
* Remove unusable include from sample
* Remove cl_d3d11 header from unit test
Lukas Weber [Wed, 20 Oct 2021 07:07:48 +0000 (09:07 +0200)]
changed no longer patented SIFT
Alexander Alekhin [Wed, 20 Oct 2021 05:45:40 +0000 (05:45 +0000)]
4.x: drop DISABLE_OPENCV_24_COMPATIBILITY macro
not used in 4.x code
Alexander Alekhin [Tue, 19 Oct 2021 19:45:35 +0000 (19:45 +0000)]
Merge pull request #20892 from alalek:issue_20888
Alexander Alekhin [Tue, 19 Oct 2021 09:28:12 +0000 (09:28 +0000)]
samples: fix build without threading support
Zhuo Zhang [Tue, 19 Oct 2021 13:30:27 +0000 (21:30 +0800)]
Merge pull request #20900 from zchrissirhcz:3.4-hwfeatures-support-qnx
* fix: correctly check neon flags for QNX platform
* refactor: change __QNXNTO__ to __QNX__
Alexander Alekhin [Tue, 19 Oct 2021 13:29:51 +0000 (13:29 +0000)]
Merge pull request #20894 from alalek:core_simd_int64_ctor_sse
rogday [Tue, 19 Oct 2021 13:29:22 +0000 (16:29 +0300)]
Merge pull request #20883 from rogday:eltwise_refactoring
* backport elementwise_layers refactor
* keep NULL
Alexander Alekhin [Tue, 19 Oct 2021 13:27:54 +0000 (13:27 +0000)]
Merge pull request #20897 from ThalesGroup:master
Alexander Alekhin [Tue, 19 Oct 2021 09:28:12 +0000 (09:28 +0000)]
samples: fix build without threading support
Michel Promonet [Mon, 18 Oct 2021 16:30:13 +0000 (18:30 +0200)]
Allow to set av_log_set_level to reduce ffmpeg level below AV_LOG_ERROR
Alexander Alekhin [Mon, 18 Oct 2021 19:08:50 +0000 (19:08 +0000)]
Merge pull request #20895 from sergiud:avx-error-immediate
Alexander Alekhin [Mon, 18 Oct 2021 07:15:15 +0000 (07:15 +0000)]
core(SIMD): update int64 SSE constructor
Anatoliy Talamanov [Mon, 18 Oct 2021 16:31:48 +0000 (19:31 +0300)]
Merge pull request #20856 from TolyaTalamanov:at/cfg-batch-size
G-API: Extend ie::Params to specify batch size
* Add cfgBatchSize to ie::Params
* Fix comments to review
Sergey Ivanov [Mon, 18 Oct 2021 16:20:55 +0000 (19:20 +0300)]
Merge pull request #20773 from sivanov-work:merge_vpl_source_unite
G-API: oneVPL (simplification) unite components in entire VPL source
* Unify components in VPLSource
* Revert back decode WRN & Add compile guard
* Address come comments
* Add source alias
* Apply comment for exception handling
Sergiu Deitsch [Mon, 18 Oct 2021 12:56:15 +0000 (14:56 +0200)]
fixed AVX compile error
Some older compilers do not allow to pass a `const int` as an immediate. Use an unnamed enum instead.
Alexander Alekhin [Mon, 18 Oct 2021 04:46:00 +0000 (04:46 +0000)]
dnn(int8): fix using of incorrect UMat constructor
Alexander Alekhin [Sun, 17 Oct 2021 16:50:13 +0000 (16:50 +0000)]
Merge pull request #20879 from Wehzie:patch-1
Wehzie [Thu, 14 Oct 2021 19:39:49 +0000 (22:39 +0300)]
Fixed typo in CV_Error message
Error was "Input parameters must be a matrices!", but "matrices" is plural and doesn't allow the unspecific article "a".
Alexander Alekhin [Fri, 15 Oct 2021 15:34:30 +0000 (15:34 +0000)]
Merge pull request #20885 from alalek:cmake_fix_python_submodules
Alexander Alekhin [Fri, 15 Oct 2021 13:58:37 +0000 (16:58 +0300)]
cmake: update installation of python extra submodules
- support Python standalone builds
- loader installs submodules unconditionally
Alexander Alekhin [Fri, 15 Oct 2021 13:35:03 +0000 (13:35 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Smirnov Egor [Thu, 14 Oct 2021 14:38:57 +0000 (17:38 +0300)]
add Ceil, Floor, Log, Round, Sqrt, Not, Equal, Less, Greater
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'