Alexander Smorkalov
5af40a0269
Merge branch 4.x
2023-07-05 15:51:10 +03:00
Alexander Smorkalov
d4861bfd1f
Merge remote-tracking branch 'origin/3.4' into merge-3.4
2023-05-24 14:37:48 +03:00
Alexander Smorkalov
ae8c90301f
Fixed mask handling in AffineFeature.
2023-05-17 12:04:52 +03:00
Vadim Pisarevsky
ca48e217f1
fixed another SIFT constructor ( #23272 )
2023-02-18 00:07:45 +03:00
Vadim Pisarevsky
f48939c2d7
temporarily set "enable_precise_upscale=false" by default to avoid sporadic failures in regression tests ( #23270 )
2023-02-17 18:57:38 +03:00
Vaclav Vavra
923dbcc58f
different interpolation by double image ( #23124 )
...
* different interpolation by double image
* fixing scaling mapping
* fixing a test
* added an option to enable previous interpolation
* added doxygen entries for the new parameter
* ASSERT_TRUE -> ASSERT_EQ
* changed log message when using old upscale mode
2023-02-17 10:35:54 +03:00
Alexander Alekhin
47293f28cf
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2023-02-11 18:35:00 +00:00
whuaegeansea
400572b19f
Fix bug
2023-02-01 11:25:31 +08:00
Alexander Alekhin
f33598f55e
Merge branch 4.x
2023-01-28 17:31:32 +00:00
Alexander Alekhin
18cbfa4a4f
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2023-01-23 00:11:12 +00:00
Alexander Alekhin
974102bc7f
Merge pull request #23120 from alalek:fixup_22246_2
2023-01-10 10:01:17 +00:00
Alexander Alekhin
5bacd8753b
build: eliminate GCC9 warning from sift.simd.hpp
2023-01-10 01:38:12 +00:00
Alexander Alekhin
593a376566
Merge branch 4.x
2023-01-09 11:08:02 +00:00
Christoph Rackwitz
a64b51dd94
Merge pull request #23108 from crackwitz:issue-23107
...
Usage of imread(): magic number 0, unchecked result
* docs: rewrite 0/1 to IMREAD_GRAYSCALE/IMREAD_COLOR in imread()
* samples, apps: rewrite 0/1 to IMREAD_GRAYSCALE/IMREAD_COLOR in imread()
* tests: rewrite 0/1 to IMREAD_GRAYSCALE/IMREAD_COLOR in imread()
* doc/py_tutorials: check imread() result
2023-01-09 09:55:31 +00:00
Alexander Smorkalov
b7292bc899
Fixed blob detector parameters range.
2022-12-26 15:02:24 +03:00
augustinmanecy
0bd54a60e9
Merge pull request #20367 from augustinmanecy:features2d-rw
...
**Merge with contrib**: https://github.com/opencv/opencv_contrib/pull/3003
### Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
- [x] The PR is proposed to proper branch
- [ ] There is reference to original bug report and related work
- [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
2022-12-21 16:03:00 +03:00
Alexander Alekhin
420db56ffd
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-12-18 02:17:17 +00:00
Alexander Alekhin
6e3700593f
compatibility: keep Ptr<FileStorage> stubs till OpenCV 5.0
2022-12-16 00:47:44 +00:00
Alexander Alekhin
6a8c5a1d27
python: resolve Ptr<FileStorage> requirement issue
2022-12-16 00:47:44 +00:00
Petr Glotov
a3ebafbdeb
Merge pull request #21942 from pglotov:add-blob-contours
...
added blob contours to blob detector
* added blob contours
* Fixed Java regression test after new parameter addition to SimpleBlobDetector.
* Added stub implementation of SimpleBlobDetector::getBlobContours to presume source API compatibility.
2022-10-07 19:07:51 +03:00
Sean McBride
1829eba584
Fixed most clang -Wextra-semi warnings
2022-09-27 18:06:46 -04:00
Alexander Smorkalov
3857173845
Merge pull request #22287 from asenyaev:asen/disabled_compiling_warnings_5.x
...
Disabled compiling warnings in case of symbols in cmake for 5.x
2022-09-20 16:19:08 +03:00
Alexander Smorkalov
bfeeb0ad70
Merge pull request #22285 from asenyaev:asen/disabled_compiling_warnings_3.4
...
Disabled compiling warnings in case of symbols in cmake for 3.4
2022-09-20 15:14:36 +03:00
Alexander Smorkalov
2273af0166
Merge pull request #22286 from asenyaev:asen/disabled_compiling_warnings_4.x
...
Disabled compiling warnings in case of symbols in cmake for 4.x
2022-09-20 15:13:06 +03:00
Andrey Senyaev
752e5fdc26
Disabled compiling warnings in case of symbols in cmake for 5.x
2022-09-20 13:36:59 +03:00
Andrey Senyaev
ccfc34b13f
Disabled compiling warnings in case of symbols in cmake for 4.x
2022-09-20 13:35:48 +03:00
Andrey Senyaev
3f4abcb228
Disabled compiling warnings in case of symbols in cmake for 3.4
2022-09-20 13:34:17 +03:00
Alexander Alekhin
c25f776151
Merge branch 4.x
2022-08-21 15:27:31 +00:00
Alexander Alekhin
2ebdc04787
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2022-08-14 15:50:42 +00:00
Alexander Alekhin
d0d115321d
Merge pull request #22350 from alalek:rework_psabi_warning
2022-08-13 15:05:41 +00:00
Alexander Alekhin
44b2f9637a
Revert "suppress warning on GCC 7 and later"
...
This reverts commit a630ad73cb
.
2022-08-07 15:43:10 +03:00
Alexander Alekhin
85b0b0cd77
build: add missing GCC condition for pragma
2022-07-24 12:19:37 +03:00
Andrey Senyaev
d2b1e38207
Pragma to ignore -Waggressive-loop-optimizations on Linux ARM64
2022-07-14 11:17:38 +03:00
Tomoaki Teshima
a630ad73cb
suppress warning on GCC 7 and later
2022-07-06 23:31:31 +09:00
Namgoo Lee
24547f40ff
remove const from functions returning by value
2022-05-26 21:30:41 +09:00
Kumataro
602caa9cd6
Merge pull request #21937 from Kumataro:4.x-fix-21911
...
* Fix warnings for clang15
* Fix warnings: Remove unnecessary code
* Fix warnings: Remove unnecessary code
2022-05-13 17:32:05 +00:00
Alexander Alekhin
a0d5277e0d
Merge branch 4.x
2021-12-30 21:43:45 +00:00
Alexander Alekhin
8b4fa2605e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-12-03 12:32:49 +00:00
yuki takehara
a6277370ca
Merge pull request #21107 from take1014:remove_assert_21038
...
resolves #21038
* remove C assert
* revert C header
* fix several points in review
* fix test_ds.cpp
2021-11-27 18:34:52 +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
d612c72405
build: fix MSVC-Clang warnings about unused parameters in stubs
2021-10-28 21:08:36 +00:00
Alexander Alekhin
fce4a19d0d
5.x: cleanup compatibility code (2021-10)
2021-10-20 17:40:04 +00:00
Alexander Alekhin
7ba26ada12
Merge branch 4.x
2021-10-15 21:53:39 +00:00
Alexander Alekhin
cca4c47781
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-08 11:05:45 +00:00
Alexander Panov
dfc94c58f0
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>
2021-10-07 22:46:25 +00:00
Alexander Alekhin
03a08435e2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-10-07 04:27:22 +00:00
Alexander Alekhin
755e0143fb
Merge pull request #20815 from alalek:fix_20649_revert_19859
...
features2d: repair SimpleBlobDetector
* features2d: revert code change by PR #19859
Reverted commit 76860933f0
* features2d: check SimpleBlobDetector parameters consistency
2021-10-06 15:05:45 +03:00
Alexander Alekhin
c3ac834526
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-09-11 21:27:26 +00:00
Dale Phurrough
068f33cfdf
add nodiscard to features2d clone funcs
2021-09-09 15:20:45 +02:00
Alexander Alekhin
4c05a697fa
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2021-08-28 21:30:28 +00:00