Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source

...

This commit is contained in:

Alexander Alekhin

2020-04-24 18:32:18 +00:00

parent 15b948d109 8d05dab32c

commit 152e6476d9

30 changed files with 1658 additions and 44 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

modules/features2d/src/sift.cpp

+1190

File diff suppressed because it is too large Load Diff