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

Browse Source

...

This commit is contained in:

Alexander Alekhin

2019-01-10 12:29:41 +03:00

parent 581d0ef8a9 054bd23a43

commit 7e2ebecd52

18 changed files with 217 additions and 9 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/imgproc/src/colormap.cpp

+176 -1

File diff suppressed because one or more lines are too long