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

Browse Source

...

This commit is contained in:

Alexander Alekhin

2020-10-26 20:07:47 +00:00

parent 3d4563913d 0ec94630d4

commit f345ed564a

9 changed files with 1970 additions and 617 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

+1334 -45

File diff suppressed because it is too large Load Diff