Vincent Rabaud [Mon, 15 Nov 2021 12:09:02 +0000 (13:09 +0100)]
Fix H clamping for very small negative values.
In case of very small negative h (e.g. -1e-40), with the current implementation,
you will go through the first condition and end up with h = 6.f, and will miss
the second condition.
Alexander Alekhin [Thu, 18 Nov 2021 22:48:40 +0000 (22:48 +0000)]
Merge pull request #21067 from NickJackolson:nickjackolson/imread-warning
nickjackolson [Wed, 17 Nov 2021 20:56:55 +0000 (21:56 +0100)]
add !empty assertion in seamlessClone()
issue #20617 addresses lack of warnings on
seamlessClone() function when src is None.
This commit adds source check using CV_Assert
therefore debugging would be easier.
Signed-off-by: nickjackolson <metedurlu@gmail.com>
nickjackolson [Sun, 14 Nov 2021 19:43:50 +0000 (20:43 +0100)]
Add warning message to imread()
Add a warning message using CV_LOG__WARNING().
This way api behaviour is preserved. Outputs are
the same but user gets an extra warning in case
fopen() fails to access image file for some reason.
This would help new users and also debugging
complex apps which use imread()
Signed-off-by: nickjackolson <metedurlu@gmail.com>
Alexander Alekhin [Thu, 18 Nov 2021 18:34:44 +0000 (18:34 +0000)]
Merge pull request #21077 from alalek:js_test_pin_cli_table
Alexander Alekhin [Thu, 18 Nov 2021 05:40:16 +0000 (05:40 +0000)]
js(test): pin cli-table dependency
Alexander Alekhin [Tue, 16 Nov 2021 20:05:59 +0000 (20:05 +0000)]
Merge pull request #21064 from alalek:doc_videoio_api_preference_3.4
Alexander Alekhin [Tue, 16 Nov 2021 17:07:27 +0000 (17:07 +0000)]
doc(videoio): fix apiPreference note, replace DSHOW(deprecated)->MSMF
Qiushi Zheng [Mon, 15 Nov 2021 17:15:39 +0000 (01:15 +0800)]
Merge pull request #17889 from ZhengQiushi:my_3.4
QR code (encoding process)
* add qrcode encoder
* qr encoder fixes
* qr encoder: fix api and realization
* fixed qr encoder, added eci and kanji modes
* trigger CI
* qr encoder constructor fixes
Co-authored-by: APrigarina <ann73617@gmail.com>
Alexander Alekhin [Thu, 11 Nov 2021 22:54:07 +0000 (01:54 +0300)]
Merge pull request #21025 from alalek:issue_21004
* dnn(ocl4dnn): fix LRN layer accuracy problems
- FP16 intermediate computation is not accurate and may provide NaN values
* dnn(test): update tolerance for FP16
tv3141 [Wed, 10 Nov 2021 19:15:38 +0000 (20:15 +0100)]
Merge pull request #21030 from tv3141:fix_seg_fault_houghlinespointset
Fix seg fault houghlinespointset
* Clarify parameter doc for HoughLinesPointSet
* Fix seg fault.
* Add regression test.
* Fix latex typo
Alexander Alekhin [Wed, 10 Nov 2021 16:08:20 +0000 (16:08 +0000)]
Merge pull request #20870 from pkubaj:master
Piotr Kubaj [Wed, 13 Oct 2021 16:19:57 +0000 (18:19 +0200)]
Add support for runtime CPU feature check on POWER on FreeBSD.
1. Code uses PPC_FEATURE_HAS_VSX, but it's not checked similarly to
PPC_FEATURE2_ARCH_3_00 and PPC_FEATURE2_ARCH_3_00 for availability. FreeBSD has
those macros in machine/cpu.h, but I went with the way chosen for
PPC_FEATURE2_ARCH_3_00 and PPC_FEATURE2_ARCH_3_00. Other than that, FreeBSD also
has sys/auxv.h and that's where elf_aux_info() is defined.
2. getauxval() is actually Linux-only, but code checked for __unix__. It won't
work on all UNIX, so change it back to __linux__. Add another code variant
strictly for FreeBSD.
3. Update comment. This commit adds code for FreeBSD, but recently there
appeared support for powerpc64 in OpenBSD.
ZaKiiiiiiiii [Tue, 9 Nov 2021 16:24:04 +0000 (00:24 +0800)]
Merge pull request #20904 from Crayon-new:fix_bug_in_maxLayer
fix bug: wrong output dimension when "keep_dims" is false in pooling layer.
* fix bug in max layer
* code align
* delete permute layer and add test case
* add name assert
* check other cases
* remove c++11 features
* style:add "const" remove assert
* style:sanitize file names
Alexander Alekhin [Sat, 6 Nov 2021 14:19:57 +0000 (14:19 +0000)]
Merge pull request #21005 from nikpappas:bug-samples-falsecolor-trackbar
Nikolaos Pappas [Wed, 3 Nov 2021 22:13:30 +0000 (22:13 +0000)]
Fix trackbar in falsecolor cpp sample
Alexander Alekhin [Fri, 5 Nov 2021 09:25:50 +0000 (09:25 +0000)]
Merge pull request #21011 from vrabaud:3.4
Vincent Rabaud [Thu, 4 Nov 2021 21:48:10 +0000 (22:48 +0100)]
Only use fma functions when CV_FMA3 is set.
In practice, processors offering AVX2/AVX512 also FMA, that is why it got unnoticed.
Alexander Alekhin [Thu, 4 Nov 2021 12:28:27 +0000 (12:28 +0000)]
Merge pull request #21007 from alalek:cmake_dnn_fix_wrong_tengine_order
Alexander Alekhin [Thu, 4 Nov 2021 09:59:19 +0000 (09:59 +0000)]
dnn(cmake): don't hijack OpenCL options with Tengine
Alexander Alekhin [Wed, 3 Nov 2021 22:32:00 +0000 (22:32 +0000)]
Merge pull request #21003 from APrigarina:add_test_qrdetect_fix
Alexander Alekhin [Wed, 3 Nov 2021 20:30:24 +0000 (20:30 +0000)]
Merge pull request #20882 from flytogcp:flytogcp-patch-1
APrigarina [Wed, 3 Nov 2021 17:04:27 +0000 (20:04 +0300)]
add test case for QR detect fix
Alexander Alekhin [Wed, 3 Nov 2021 19:51:31 +0000 (19:51 +0000)]
Merge pull request #20990 from alalek:fix_warnings_msvc_clang_dshow_3.4
cpengu [Fri, 15 Oct 2021 03:11:35 +0000 (11:11 +0800)]
Update qrcode.cpp
Fixed issue #20880, QRDetect::searchHorizontalLines() boundary condition will skip the matched qrcode near the end
Alexander Alekhin [Wed, 3 Nov 2021 15:59:36 +0000 (18:59 +0300)]
Merge pull request #20999 from alalek:dnn_replace_deprecated_calls
dnn(protobuf): replace deprecated calls
* dnn: replace deprecated ByteSize() => ByteSizeLong()
* dnn: replace deprecated calls, use GetRepeatedFieldRef
Alexander Alekhin [Tue, 2 Nov 2021 20:41:17 +0000 (20:41 +0000)]
Merge pull request #20970 from s-trinh:update_Bayer_naming
Alexander Alekhin [Tue, 2 Nov 2021 19:22:47 +0000 (19:22 +0000)]
videoio(dshow): eliminate build warnings from MSVC-Clang
Souriya Trinh [Thu, 28 Oct 2021 21:46:13 +0000 (23:46 +0200)]
Add conventional Bayer naming.
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: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 [Fri, 29 Oct 2021 17:45:09 +0000 (17:45 +0000)]
Merge pull request #20971 from alalek:cmake_build_type_use_release
Alexander Alekhin [Thu, 28 Oct 2021 23:02:32 +0000 (02:02 +0300)]
cmake: use CMAKE_BUILD_TYPE=Release by default
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
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 19:59:57 +0000 (19:59 +0000)]
Merge pull request #20958 from noahstier:3.4_tvl1_optimization
Noah Stier [Wed, 27 Oct 2021 19:01:53 +0000 (12:01 -0700)]
tvl1 cuda optflow optimization
Alexander Alekhin [Fri, 22 Oct 2021 14:08:08 +0000 (14:08 +0000)]
Merge pull request #20919 from berak:patch-1
berak [Thu, 21 Oct 2021 09:38:17 +0000 (11:38 +0200)]
resolves #20913
imgproc: remove asserts for circles_ in HoughCircles
Alexander Alekhin [Thu, 21 Oct 2021 16:26:53 +0000 (16:26 +0000)]
Merge pull request #20912 from AleksandrPanov:fix_findMinEnclosingTriangle
AleksandrPanov [Thu, 21 Oct 2021 15:12:51 +0000 (18:12 +0300)]
fix findMinEnclosingTriangle and add tests
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
Harvey [Thu, 21 Oct 2021 08:47:27 +0000 (16:47 +0800)]
32bit rgb bmp file should not copy data as rgba
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
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
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 [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".
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 [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
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
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 [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: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:32 +0000 (14:42 +0200)]
add new supported MSVC version
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>
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:06:08 +0000 (15:06 +0000)]
Merge pull request #20808 from alalek:update_ffmpeg_3.4
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 20:47:07 +0000 (20:47 +0000)]
pre: OpenCV 3.4.16 (version++)
Alexander Alekhin [Mon, 4 Oct 2021 19:16:27 +0000 (19:16 +0000)]
Merge pull request #20803 from alalek:core_parallel_workaround_tsan
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>