ZaKiiiiiiiii
98b6ce353c
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
2021-11-09 19:24:04 +03:00
Alexander Alekhin
58043dac0f
Merge pull request #21027 from anonymouss:4.x
2021-11-09 15:12:35 +00:00
jcong
d2c1f1131b
videoio: drop unnecessary offset for accessing video output buffer
...
Fix : #21021
NDK API AMediaCodec_getOutputBuffer() returns MediaCodecBuffer::data()
which is actually ABuffer::data(). The returned buffer address is already
adjusted by offset.
More info:
ABuffer::base() returns base address without offset
ABuffer::data() returns base + offset
Change-Id: I2936339ce4fa9acf657a5a7d92adc1275d7b28a1
2021-11-09 17:23:34 +08:00
Lukas-Alexander Weber
fa5c7a9e75
Merge pull request #21020 from lukasalexanderweber:squash
...
Created Stitching Tool based on stitching_detailed.py
2021-11-08 11:54:06 +00:00
Alexander Alekhin
ceb94d52a1
Merge pull request #21016 from alalek:issue_21002
2021-11-06 22:12:40 +00:00
Alexander Alekhin
a2716712ab
highgui(win32): fix trackbar setRange
2021-11-06 15:19:22 +00:00
Alexander Alekhin
1ac7baceff
Merge pull request #21005 from nikpappas:bug-samples-falsecolor-trackbar
2021-11-06 14:19:58 +00:00
Nikolaos Pappas
968d94d417
Fix trackbar in falsecolor cpp sample
2021-11-06 10:11:58 +00:00
Alexander Alekhin
7842181b47
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-11-05 09:27:46 +00:00
Alexander Alekhin
2ce47fda88
Merge pull request #21011 from vrabaud:3.4
2021-11-05 09:25:50 +00:00
Vincent Rabaud
ffd010767f
Only use fma functions when CV_FMA3 is set.
...
In practice, processors offering AVX2/AVX512 also FMA, that is why it got unnoticed.
2021-11-04 23:15:49 +01:00
Alexander Alekhin
635990a5b0
Merge pull request #21009 from alalek:dnn_skip_tests_32bit
2021-11-04 18:15:50 +00:00
Alexander Alekhin
562f2375c5
dnn(test): skip tests with high memory usage
...
- 32-bit configuration may fail due to memory fragmentation
2021-11-04 13:26:33 +00:00
Alexander Alekhin
edf533c83e
Merge pull request #21007 from alalek:cmake_dnn_fix_wrong_tengine_order
2021-11-04 12:28:27 +00:00
Alexander Alekhin
c1d61c88e9
dnn(cmake): don't hijack OpenCL options with Tengine
2021-11-04 09:59:19 +00:00
Alexander Alekhin
6360b846c6
Merge pull request #21003 from APrigarina:add_test_qrdetect_fix
2021-11-03 22:32:00 +00:00
Alexander Alekhin
57900d07f0
Merge pull request #20882 from flytogcp:flytogcp-patch-1
2021-11-03 20:30:24 +00:00
APrigarina
8e72e1ed88
add test case for QR detect fix
2021-11-03 19:56:54 +00:00
Alexander Alekhin
10c547396d
Merge pull request #20990 from alalek:fix_warnings_msvc_clang_dshow_3.4
2021-11-03 19:51:31 +00:00
cpengu
66dd871288
Update qrcode.cpp
...
Fixed issue #20880 , QRDetect::searchHorizontalLines() boundary condition will skip the matched qrcode near the end
2021-11-03 19:45:24 +00:00
Alexander Alekhin
d484939c02
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
2021-11-03 15:59:36 +00:00
Alexander Alekhin
85fd8729ce
Merge pull request #20970 from s-trinh:update_Bayer_naming
2021-11-02 20:41:17 +00:00
Alexander Alekhin
b3e16c6423
videoio(dshow): eliminate build warnings from MSVC-Clang
2021-11-02 19:22:47 +00:00
Souriya Trinh
30d6766db4
Add conventional Bayer naming.
2021-11-02 20:17:57 +01:00
Trutnev Aleksei
17234f82d0
Merge pull request #20836 from alexgiving:atrutnev/rename_Adapter_to_IAdapter
...
* Rename RMat::Adapter to RMat::IAdapter
* Add comments
2021-11-01 12:43:27 +00:00
Alexander Alekhin
7b57df02a7
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-30 14:26:17 +00:00
Alexander Alekhin
b65ae3b036
Merge pull request #20982 from alalek:highgui_drop_cvGetWindowImageRect_4.x
2021-10-30 14:01:33 +00:00
Alexander Alekhin
bce76a7977
Merge pull request #20980 from alalek:highgui_fix_cvGetWindowImageRect_3.4
2021-10-30 13:59:08 +00:00
Alexander Alekhin
66f3e97457
highgui: drop invalid cvGetWindowImageRect
2021-10-30 12:47:07 +00:00
Alexander Alekhin
0ee61d178f
highgui: drop invalid cvGetWindowImageRect
...
- return type is C++ template
- removal from 'extern "C"' scope broke ABI anyway, so this symbols is removed completelly
2021-10-30 12:40:20 +00:00
Alexander Alekhin
1ceba29f4b
Merge pull request #20976 from alalek:issue_20968
2021-10-30 10:27:32 +00:00
Alexander Alekhin
40c748a2ae
python: properly handle step for multichannel case
2021-10-29 18:29:19 +00:00
Alexander Alekhin
0e9453a395
Merge pull request #20971 from alalek:cmake_build_type_use_release
2021-10-29 17:45:09 +00:00
Julie Bareeva
69d0bc8fd5
Added overflow handling during conversion from float to int for LinearFilter
2021-10-29 19:46:11 +03:00
Trutnev Aleksei
6a73e5a720
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
2021-10-29 16:30:35 +00:00
Alexander Alekhin
e70ba29d95
Merge pull request #20972 from Isydmr:correct-db-text-detector-drive-links
2021-10-29 15:19:34 +00:00
Alexander Alekhin
e5647cf70d
cmake: use CMAKE_BUILD_TYPE=Release by default
2021-10-29 15:15:17 +00:00
Ihsan Soydemir
9637cf0574
Correct drive links for DB_IC15 and DB_TD500
2021-10-29 13:30:51 +03:00
Alexander Alekhin
74cc63ba2f
Merge pull request #20969 from alalek:fix_msvc_clang_warning_noreturn
2021-10-28 23:00:49 +00:00
Ruan
1470f90c2a
Merge pull request #20784 from No-Plane-Cannot-Be-Detected:next
...
Add 3D point cloud sampling functions to branch next
* Add several 3D point cloud sampling functions: Random, VoxelGrid, FarthestPoint.
* Made some code detail changes and exposed the random number generator parameters at the interface.
* Add simple tests for sampling.
* Modify interface output parameters.
* Modify interface return value.
* The sampling test is modified for the new changes of function interface.
* Improved test of VoxelGridFilterSampling
* Improved test of VoxelGridFilterSampling and FPS.
* Add test for the dist_lower_limit arguments of FPS function.
* Optimization function _getMatFromInputArray.
* Optimize the code style and some details according to the suggestions.
* Clear prefix cv: in the source code.
* Change the initialization of Mat in the sampling test.
* 1. Unified code style
2. Optimize randomSampling method
* 1. Optimize code comments.
2. Remove unused local variables.
* Rebuild the structure of the test, make the test case more reliable, and change the code style.
* Update test_sampling.cpp
Fix a warning.
2021-10-29 01:41:21 +03:00
Alexander Alekhin
0b6e360602
Merge pull request #20967 from alalek:fix_msvc_clang_unused_parameter
2021-10-28 22:27:41 +00:00
Alexander Alekhin
a49cda6523
core: eliminate Winvalid-noreturn in base.hpp
2021-10-28 21:33:20 +00:00
Alexander Alekhin
d612c72405
build: fix MSVC-Clang warnings about unused parameters in stubs
2021-10-28 21:08:36 +00:00
Maxim Pashchenkov
eb152d7431
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
2021-10-28 18:19:46 +00:00
Alexander Alekhin
6bd143dd25
Merge pull request #20961 from alalek:fix_msvc_clang
2021-10-28 13:54:24 +00:00
Alexander Alekhin
770d3eabc0
Merge pull request #20960 from alalek:fix_icc_support_3.4
2021-10-28 13:54:07 +00:00
Alexander Alekhin
75e2ba5af3
core(simd): fix compilation with MSVC-Clang
2021-10-28 11:25:00 +00:00
Alexander Alekhin
1726bb6c0d
build(icc): fix nodiscard attribute handling
2021-10-28 05:52:22 +00:00
Alexander Alekhin
5dfe65d53a
cmake: fix popcnt detection with Intel Compiler
2021-10-28 05:37:23 +00:00
Alexander Alekhin
83afd09f13
Merge pull request #20950 from Harvey-Huang:master
2021-10-27 20:09:51 +00:00
