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

Merge branch 'master' of git://github.com/Opencv/opencv into UserColormap

Browse Source
This commit is contained in:
LaurentBerger
2017-01-09 10:38:08 +01:00
parent a2f3692bff 45f0cf0d41
commit 5e08d588f8
15 changed files with 153 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/drawing.cpp
+6
View File
@@ -1171,6 +1171,9 @@ FillConvexPoly( Mat& img, const Point2l* v, int npts, const void* color, int lin
edge[0].di = 1;
edge[1].di = npts - 1;
edge[0].x = edge[1].x = -XY_ONE;
edge[0].dx = edge[1].dx = 0;
ptr += img.step*y;
do
@@ -1213,6 +1216,9 @@ FillConvexPoly( Mat& img, const Point2l* v, int npts, const void* color, int lin
}
}
if (edges < 0)
break;
if (y >= 0)
{
int left = 0, right = 1;