potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin
2020-01-22 16:58:30 +03:00
parent 8b3042da63 3019927a61
commit 3d14dd4e39
32 changed files with 1151 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/photo/src/seamless_cloning.cpp
+2 -2
View File
@@ -51,8 +51,8 @@ static Mat checkMask(InputArray _mask, Size size)
{
Mat mask = _mask.getMat();
Mat gray;
if (mask.channels() == 3)
cvtColor(mask, gray, COLOR_BGR2GRAY);
if (mask.channels() > 1)
cvtColor(mask, gray, COLOR_BGRA2GRAY);
else
{
if (mask.empty())