ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus: Use GdipFillPath to implement GdipFillPolygon.

This commit is contained in:
Vincent Povirk 2011-03-10 16:42:30 -06:00 committed by Alexandre Julliard
parent b17d64923e
commit 86d55d43c5
1 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dlls/gdiplus/graphics.c
View File

@ -3511,10 +3511,8 @@ GpStatus WINGDIPAPI GdipFillPieI(GpGraphics *graphics, GpBrush *brush, INT x,
GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush,
GDIPCONST GpPointF *points, INT count, GpFillMode fillMode) GDIPCONST GpPointF *points, INT count, GpFillMode fillMode)
{ {
INT save_state; GpStatus stat;
GpPointF *ptf = NULL; GpPath *path;
POINT *pti = NULL;
GpStatus retval = Ok;
TRACE("(%p, %p, %p, %d, %d)\n", graphics, brush, points, count, fillMode); TRACE("(%p, %p, %p, %d, %d)\n", graphics, brush, points, count, fillMode);
@ -3524,41 +3522,19 @@ GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush,
if(graphics->busy) if(graphics->busy)
return ObjectBusy; return ObjectBusy;
if(!graphics->hdc) stat = GdipCreatePath(fillMode, &path);
if (stat == Ok)
{ {
FIXME("graphics object has no HDC\n"); stat = GdipAddPathPolygon(path, points, count);
return Ok;
if (stat == Ok)
stat = GdipFillPath(graphics, brush, path);
GdipDeletePath(path);
} }
ptf = GdipAlloc(count * sizeof(GpPointF)); return stat;
pti = GdipAlloc(count * sizeof(POINT));
if(!ptf || !pti){
retval = OutOfMemory;
goto end;
}
memcpy(ptf, points, count * sizeof(GpPointF));
save_state = SaveDC(graphics->hdc);
EndPath(graphics->hdc);
SetPolyFillMode(graphics->hdc, (fillMode == FillModeAlternate ? ALTERNATE
: WINDING));
transform_and_round_points(graphics, pti, ptf, count);
BeginPath(graphics->hdc);
Polygon(graphics->hdc, pti, count);
EndPath(graphics->hdc);
brush_fill_path(graphics, brush);
RestoreDC(graphics->hdc, save_state);
end:
GdipFree(ptf);
GdipFree(pti);
return retval;
} }
GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush, GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush,