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

Browse Source

...

This commit is contained in:

Alexander Alekhin

2020-01-28 13:16:03 +03:00

parent f856c964e2 223790e6fc

commit 560f85f8e5

40 changed files with 3133 additions and 740 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/objdetect/src/qrcode.cpp

+1297 -164

File diff suppressed because it is too large Load Diff